Christopher Jones
b3a2b44198
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fixed bug #65939 (Space before ";" breaks php.ini parsing). (brainstorm at nopcode dot org)
2013-10-21 14:21:19 -07:00
Christopher Jones
b6ceea4a25
Fixed bug #65939 (Space before ";" breaks php.ini parsing). (brainstorm at nopcode dot org)
2013-10-21 14:20:35 -07:00
Lior Kaplan
e98fc7de52
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Add information about which INI file is which inside respective files
2013-09-27 17:50:03 +02:00
Ondřej Surý
0ad0a2f56e
Add information about which INI file is which inside respective files
2013-09-27 17:46:14 +02:00
Christopher Jones
5ac7c533a0
More OCI8 DTrace probe updates.
...
Change php.ini-* doc to match an earlier change to config.w32
2013-09-26 21:12:11 -07:00
Adam Harvey
b8beb657ca
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Tinker with the wording of the short_open_tag description.
Conflicts:
php.ini-development
php.ini-production
2013-09-09 16:59:26 -07:00
Adam Harvey
d209c362d2
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Tinker with the wording of the short_open_tag description.
2013-09-09 16:58:35 -07:00
Adam Harvey
160cd8d0a7
Tinker with the wording of the short_open_tag description.
...
I'm still not thrilled with this, but it's a bit better and addresses the
issues noted in bug #65644 . Plus, it now mentions the decoupling of <?=.
2013-09-09 16:56:57 -07:00
Yasuo Ohgaki
8da7aa7e41
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Add session.use_strict_mode description to php.ini-*
2013-08-20 18:30:46 +09:00
Yasuo Ohgaki
4cd9796be7
Add session.use_strict_mode description to php.ini-*
2013-08-20 18:30:30 +09:00
Stanislav Malyshev
0f09b978cc
Merge branch 'PHP-5.5'
...
* PHP-5.5:
php.ini-development/production: remove php_zip.dll
Update NEWS
Update NEWS
2013-08-10 17:31:59 -07:00
Stanislav Malyshev
143ec70638
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
php.ini-development/production: remove php_zip.dll
Update NEWS
2013-08-10 17:31:48 -07:00
Jan Ehrhardt
503d39d925
php.ini-development/production: remove php_zip.dll
...
Remove the reference to php_zip.dll in php.ini-production and
php.ini-development, because php_zip.dll does not exist anymore since
PHP 5.3
2013-08-10 17:31:40 -07:00
Stanislav Malyshev
1a05648e6d
Merge branch 'PHP-5.5'
...
* PHP-5.5:
next is 5.5.2
add a few comment
allow both the old and new cfg argument to work. (the old of course should contain the typo)
mssql.compatability_mode fix
Conflicts:
configure.in
main/php_version.h
2013-07-21 21:17:59 -07:00
Veres Lajos
b8941a73cc
mssql.compatability_mode fix
2013-07-21 21:12:16 -07:00
Yasuo Ohgaki
0a7c88884e
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Improve php.ini-* documentation
2013-07-18 14:10:34 +09:00
Yasuo Ohgaki
d6692514f8
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Improve php.ini-* documentation
2013-07-18 14:10:05 +09:00
Yasuo Ohgaki
445dffa75a
Improve php.ini-* documentation
2013-07-18 14:08:28 +09:00
Stanislav Malyshev
2c8a4af892
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fix bug #62665 : add curl.cainfo to php.ini
2013-07-14 23:57:16 -07:00
Stanislav Malyshev
8c663fd4cc
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fix bug #62665 : add curl.cainfo to php.ini
Conflicts:
php.ini-development
php.ini-production
2013-07-14 23:56:59 -07:00
Stanislav Malyshev
2bad01e61b
Fix bug #62665 : add curl.cainfo to php.ini
...
Conflicts:
php.ini-development
php.ini-production
2013-07-14 23:56:03 -07:00
Remi Collet
ab165d3465
Merge branch 'PHP-5.5'
...
* PHP-5.5:
apply change from opcache readme to php.ini
2013-04-11 07:06:36 +02:00
Remi Collet
6df1e8d3fe
apply change from opcache readme to php.ini
2013-04-11 07:05:56 +02:00
Dmitry Stogov
e67e6a1f36
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Added opcache.enable_cli=0
2013-03-27 21:08:58 +04:00
Dmitry Stogov
26f3ff25fe
Added opcache.enable_cli=0
2013-03-27 21:08:18 +04:00
David Soria Parra
95c3b9ab39
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Add OPCache ini settings to php.ini
2013-03-21 15:52:12 +01:00
David Soria Parra
293d5defb4
Add OPCache ini settings to php.ini
2013-03-21 15:51:23 +01:00
Stanislav Malyshev
992bba6aef
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Add news for bug #60524
Implemented Feature #60524 (sys_temp_dir)
Conflicts:
UPGRADING
2013-01-28 22:56:51 -08:00
ALeX Kazik
475a644bd8
Implemented Feature #60524 (sys_temp_dir)
...
Added a new configuration directive which allows it to change the
temporary directory, the default behavior is unchanged.
This is a useful option if you use all/some hosts inside of one .ini file
with sections and want to change the temp dir per user (maybe it's not
allowed to write outside the users home directory). Since the TMPDIR
variable affects the whole php that way can not be used for this scenario.
(see https://bugs.php.net/bug.php?id=60524 )
2013-01-28 22:37:43 -08:00
Bryan Hanks, PMP
e7f8f7c01c
Corrected spelling of 'shortcut'
2012-11-12 13:12:13 -06:00
Bryan Hanks, PMP
d0727b58da
Corrected grammar/spelling of text in php.ini files
...
There are no actual code changes here; I corrected grammar and spelling
errors in the php.ini-production and php.ini-development files. I also
rewrote some sentences to make them less cumbersome.
2012-11-12 13:04:32 -06:00
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