Commit Graph

108 Commits

Author SHA1 Message Date
Florian Anderiasch
81de111131 Merge branch 'PHP-5.4'
* PHP-5.4:
  Add syslog support to mail.log #62356
2012-07-24 14:34:41 +02:00
Florian Anderiasch
ddc8d16245 Add syslog support to mail.log #62356
Patch by Michael Orlitzky
2012-07-24 14:31:30 +02:00
Xinchen Hui
61a13773bc Merge branch 'PHP-5.4'
* PHP-5.4:
  Fixed bug #62128 superfluous ";"
2012-05-25 22:34:06 +08:00
Xinchen Hui
91ad40d9bb Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  Fixed bug #62128 superfluous ";"
2012-05-25 22:33:17 +08:00
Xinchen Hui
c3547f1935 Fixed bug #62128 superfluous ";" 2012-05-25 22:31:49 +08:00
Johannes Schlüter
9ca4710c9f Merge branch 'PHP-5.4'
* PHP-5.4:
  Fix slight grammar glitch (thanks Dan Brown)
2012-04-19 00:08:42 +02:00
Johannes Schlüter
cc85e7c313 Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  Fix slight grammar glitch (thanks Dan Brown)
2012-04-19 00:08:36 +02:00
Johannes Schlüter
710021d1d4 Fix slight grammar glitch (thanks Dan Brown) 2012-04-19 00:07:40 +02:00
Yasuo Ohgaki
cfb2df5fb7 Adjust mbstring php.ini settings 2012-03-27 00:34:21 +09:00
slumbers99
833dcf3cf7 mbstring use UTF-8 2012-03-26 18:56:51 +09:00
Pierre Joye
5f31ecacd8 - Fix bug #61424, ext/sqlite is not bundled anymore, remove it from php.ini 2012-03-17 08:52:27 +00:00
Pierre Joye
8fec627bd8 - Fix bug #61424, ext/sqlite is not bundled anymore, remove it from php.ini 2012-03-17 08:52:27 +00:00
Christopher Jones
4fff4753ac Change PHP 6 refs to PHP 5.4 and sync some spelling with PHP_5_4 branch files 2012-03-01 20:05:18 +00:00
Christopher Jones
32c6c1659f Merge Stas's 5.4 r323128 to trunk 2012-02-09 23:53:07 +00:00
Stanislav Malyshev
fe5d10d072 change 6.0.0 to 5.4.0 2012-02-08 20:12:44 +00:00
Dmitry Stogov
b8a08bf263 Added max_input_vars directive to prevent attacks based on hash collisions 2011-12-15 10:31:02 +00:00
Dmitry Stogov
e467a791d3 Added max_input_vars directive to prevent attacks based on hash collisions 2011-12-15 10:31:02 +00:00
Dmitry Stogov
a099e0d2f6 Added max_input_vars directive to prevent attacks based on hash collisions 2011-12-15 10:31:02 +00:00
Felipe Pena
fbe48da396 - Fixed bug #60489 (Simple Typo In php.ini Files)
patch by: danbrown at php.net
2011-12-09 22:43:01 +00:00
Felipe Pena
0c9fb81c50 - Fixed bug #60489 (Simple Typo In php.ini Files)
patch by: danbrown at php.net
2011-12-09 22:43:01 +00:00
Felipe Pena
9e06b00e71 - Fixed bug #60489 (Simple Typo In php.ini Files)
patch by: danbrown at php.net
2011-12-09 22:43:01 +00:00
Hannes Magnusson
0a7fd1962b Uhh.. Can't believe noone noticed the gc option was missing from our ini files 2011-12-08 14:57:02 +00:00
Hannes Magnusson
6b7d4bd322 Uhh.. Can't believe noone noticed the gc option was missing from our ini files 2011-12-08 14:57:02 +00:00
Hannes Magnusson
d0f7573b39 Uhh.. Can't believe noone noticed the gc option was missing from our ini files 2011-12-08 14:57:02 +00:00
Christopher Jones
5fdb19fba0 Miscellaneous: move misplaced entry; fix typos; note more precise OCI8 DLL dependency; remove session.entropy_file setting which was only in PHP_5_3 php.ini-development 2011-11-29 22:33:55 +00:00
Christopher Jones
d9e955c6b2 Miscellaneous: move misplaced entry; fix typos; note more precise OCI8 DLL dependency; remove session.entropy_file setting which was only in PHP_5_3 php.ini-development 2011-11-29 22:33:55 +00:00
Christopher Jones
e612e7a405 Miscellaneous: move misplaced entry; fix typos; note more precise OCI8 DLL dependency; remove session.entropy_file setting which was only in PHP_5_3 php.ini-development 2011-11-29 22:33:55 +00:00
Pierre Joye
d4406ad0a4 - add crt warning ini 2011-11-24 12:51:28 +00:00
Pierre Joye
22f80eadf7 - add crt warning ini 2011-11-24 12:51:28 +00:00
Pierre Joye
91983739e7 - add crt warning ini 2011-11-24 12:51:28 +00:00
Christian Stocker
c9b5d92821 Fix wrong comment
Add new xsl ini options to php.ini
2011-10-06 18:30:55 +00:00
Peter Cowburn
24cbd8f3fe typofix (procgress to progress) 2011-10-03 08:45:06 +00:00
Peter Cowburn
004cc53ab9 typofix (procgress to progress) 2011-10-03 08:45:06 +00:00
Peter Cowburn
4750c3fbe1 Fix php.ini comment (#55834) 2011-10-03 08:40:26 +00:00
Peter Cowburn
8f545a7429 Fix php.ini comment (#55834) 2011-10-03 08:40:26 +00:00
Hannes Magnusson
2db05d6f41 Fixed bug#55430, introduce the session.upload_progress family to the world 2011-08-30 11:13:22 +00:00
Hannes Magnusson
3c1874143c Fixed bug#55430, introduce the session.upload_progress family to the world 2011-08-30 11:13:22 +00:00
Arpad Ray
8590f2587a add friendly log messages (req #55109) 2011-08-29 21:59:27 +00:00
Arpad Ray
88e36378ff add friendly log messages (req #55109) 2011-08-29 21:59:27 +00:00
Hannes Magnusson
2594143683 Add missing session ini options "skeletons" until they become atleast documented 2011-08-29 20:50:33 +00:00
Hannes Magnusson
23b3468bc9 Add missing session ini options "skeletons" until they become atleast documented 2011-08-29 20:50:33 +00:00
Hannes Magnusson
88c4f560d0 Sync -development with -production 2011-08-23 10:00:18 +00:00
Hannes Magnusson
17fb5f539d Sync -development with -production 2011-08-23 10:00:18 +00:00
Hannes Magnusson
5f38ffb167 Sync -development with -production 2011-08-23 10:00:18 +00:00
Derick Rethans
840ef1e320 - Turn on html_errors by default again in php.ini-production like it was in
PHP 5.3, but only generate docref links when the docref_root INI setting is
  not empty.
2011-08-10 16:31:29 +00:00
Derick Rethans
7b84e7ea1c - Turn on html_errors by default again in php.ini-production like it was in
PHP 5.3, but only generate docref links when the docref_root INI setting is
  not empty.
2011-08-10 16:31:29 +00:00
Stanislav Malyshev
24392c37d9 No E_STRICT in production 2011-07-24 05:42:29 +00:00
Stanislav Malyshev
3f43c3ef9d No E_STRICT in production 2011-07-24 05:42:29 +00:00
Stanislav Malyshev
4d926b1fa3 Change E_ALL to include E_STRICT 2011-07-23 22:07:22 +00:00
Stanislav Malyshev
7bb8f9eecb Change E_ALL to include E_STRICT 2011-07-23 22:07:22 +00:00