Commit Graph

182 Commits

Author SHA1 Message Date
Julien Pauli
3f09d301b5 Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
  Update default_mimetype ini setting description
2015-12-24 10:33:41 +01:00
Thomas Punt
9306c1d254 Update default_mimetype ini setting description
This is in response to doc bug #70287
2015-12-24 10:33:15 +01:00
Xinchen Hui
9374977d21 Merge branch 'PHP-5.6' into PHP-7.0
Conflicts:
	ext/opcache/Optimizer/pass1_5.c
2015-12-17 14:30:00 +08:00
Lior Kaplan
96fe1dfe53 Add entry for session.lazy_write 2015-12-16 11:37:43 +02:00
Lior Kaplan
ef9ddd0d82 Remove sqlite extension leftover references (was removed in PHP 5.4) 2015-12-16 09:40:02 +02:00
Xinchen Hui
0a1e199682 Fixed bug #70624 opcache.huge_code_pages 2015-11-09 12:21:45 +08:00
Dmitry Stogov
41a184be10 Added information about new opcache configuration directives 2015-09-17 12:51:43 +03:00
softwarespot
76a0cbc0c2 Removed trailing whitespace 2015-08-26 22:24:46 +03:00
Christoph M. Becker
80b6a13553 Merge branch 'PHP-5.6'
* PHP-5.6:
  Fix #53840: Misleading extension entries in php.ini
2015-07-14 10:11:50 +02:00
Christoph M. Becker
72554891e3 Fix #53840: Misleading extension entries in php.ini
As of PHP 5.3.0 the php_pspell.dll is not delivered anymore with the Windows
binaries, and according to bug #47464 that's highly unlike to change. So it's
appropriate to remove the respective extension entry from php.ini.
2015-07-14 10:09:29 +02:00
Anatol Belski
4bf70f4d98 mention pcre.jit in the supplied php.ini-* 2015-07-07 16:15:56 +02:00
Dmitry Stogov
ae88a243e4 Rmoved opcache.load_comments. 2015-06-15 14:01:26 +03:00
Christoph M. Becker
336cfac7f3 ext/mysql has been removed as of PHP 7.0.0
So remove all related settings from php.ini-*, and add a respective entry in
UPGRADING (strangly, this part of fd1578c has been lost).
2015-06-13 16:44:52 +02:00
Andy Footner
ed87d16c38 fix typo in php.ini 2015-05-01 12:38:07 +02:00
Bob Weinand
2c2d1a79ce Hmm, zend.assertions is not really on/off, but -1/0/1 2015-04-19 14:42:31 +02:00
Bob Weinand
306f9123d6 Add zend.assertions and assert.exception to php.ini-* 2015-04-19 13:27:28 +02:00
Anatol Belski
c404518d94 removed obsolete php.ini options 2015-02-10 08:48:19 +01:00
PeeHaa
9b6f8bfd4d Added two missing opcache ini directives (restrict_api and mmap_base) 2015-01-31 18:45:01 +01:00
Stanislav Malyshev
135e30034c Merge branch 'PHP-5.6'
* PHP-5.6:
  Update comments in php.ini
2014-11-23 16:14:15 -08:00
Stanislav Malyshev
7e4de4f8d6 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Update comments in php.ini
2014-11-23 16:13:58 -08:00
Sobak
6d148f7ed9 Update comments in php.ini 2014-11-23 16:13:44 -08:00
Stanislav Malyshev
1edc826bed Merge branch 'PHP-5.6'
* PHP-5.6:
  Fix php.ini-*'s comment about directive: request_order
2014-11-23 16:08:14 -08:00
Reeze Xia
7386b74b07 Fix php.ini-*'s comment about directive: request_order
request_order directive only support register G,P,C but not all of
the EGPCS global variables.

The doc <http://php.net/manual/en/ini.core.php#ini.request-order>
is ok.
2014-11-23 16:07:47 -08:00
Peter Cowburn
f767451980 Merge branch 'PHP-5.6'
* PHP-5.6:
  NEWS
  Fix #68355: Inconsistency in example php.ini comments
2014-11-19 17:06:59 +00:00
Chris McCafferty
1e92b24a2a Fix #68355: Inconsistency in example php.ini comments
There are some arbitrary differences between php.ini-production and
php.ini-development. This patch corrects the differences.
2014-11-19 16:57:47 +00:00
Nikita Popov
e756333bbb Remove <% and <script language="php"> tags
As per https://wiki.php.net/rfc/remove_alternative_php_tags.

Removes:
 * <% opening tag
 * %> closing tag
 * <%= short opening tag
 * /<script\s+language\s*=\s*(php|"php"|'php')\s*>/i opening tag
 * /</script>/i closing tag
 * asp_tags ini directive
2014-10-05 21:57:05 +02:00
Tjerk Meesters
b2795700cc Merge branch 'PHP-5.6'
* PHP-5.6:
  Fixed typo
2014-09-23 18:12:12 +08:00
Sebastian Zartner
876792c756 Fixed typo 2014-09-23 07:45:03 +02:00
Florian MARGAINE
cf0303e782 Replaces php5 with php7, without whitespace changes. 2014-09-20 10:01:44 +02:00
Anatol Belski
fca5889963 Merge branch 'PHP-5.6'
* PHP-5.6:
  Fixed bug #67033 Remove reference to Windows 95
2014-04-14 09:34:02 +02:00
Anatol Belski
e3abcf7826 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Fixed bug #67033 Remove reference to Windows 95
2014-04-14 09:33:49 +02:00
Anatol Belski
57d657987d Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  Fixed bug #67033 Remove reference to Windows 95
2014-04-14 09:33:31 +02:00
Anatol Belski
95c57bb646 Fixed bug #67033 Remove reference to Windows 95 2014-04-14 09:32:31 +02:00
Yasuo Ohgaki
789b10ccb5 Merge branch 'PHP-5.6'
* PHP-5.6:
 Modified php.ini-* description for encoding related changes
2014-03-18 07:29:22 +09:00
Yasuo Ohgaki
a28389b2ab Fixed typo in UPGRADING and modified php.ini-* description for encoding related changes 2014-03-18 07:28:26 +09:00
Lior Kaplan
7cf0931f18 Merge branch 'PHP-5.6'
* PHP-5.6:
  Fix typo: entory -> entry
2014-03-09 23:07:48 +02:00
Lior Kaplan
6e16cc3528 Fix typo: entory -> entry 2014-03-09 22:58:04 +02:00
Daniel Lowrey
ddd855cbc2 Merge branch 'PHP-5.6'
* PHP-5.6:
  Update php.ini files (new openssl directives)
2014-03-07 05:26:48 -07:00
Daniel Lowrey
ff3c6931c0 Update php.ini files (new openssl directives) 2014-03-07 05:26:37 -07:00
Yasuo Ohgaki
9a5cb51ebc Merge branch 'PHP-5.6'
* PHP-5.6:
  Implement RFC https://wiki.php.net/rfc/default_encoding
2014-02-13 11:56:54 +09:00
Yasuo Ohgaki
cbd108abf1 Implement RFC https://wiki.php.net/rfc/default_encoding 2014-02-13 11:54:52 +09:00
Yasuo Ohgaki
9f3a98b124 Merge branch 'PHP-5.6'
* PHP-5.6:
  Remove obsolete description
2014-01-27 18:58:06 +09:00
Yasuo Ohgaki
a63c095033 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Remove obsolete description

Conflicts:
	php.ini-development
	php.ini-production
2014-01-27 18:57:45 +09:00
Yasuo Ohgaki
de99fd7301 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  Remove obsolete description
2014-01-27 18:55:50 +09:00
Yasuo Ohgaki
4dee63ca1c Remove obsolete description 2014-01-27 18:41:31 +09:00
Michael Wallner
feb4caad09 update php.ini-* 2013-12-30 14:28:43 +01:00
Michael Wallner
bc1c2b3b31 remove always_populate_raw_post_data INI entries from master, UPGRADING.INTERNALS coming shortly 2013-12-12 11:33:06 +01:00
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