Commit Graph

391 Commits

Author SHA1 Message Date
Joe Watkins
153404fa73
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  Fix bug #69954 and remove pdo_mysql.cache_size and mysqli.cache_size INI directives
2017-10-23 09:11:41 +01:00
Peter Kokot
14609ca6ff
Fix bug #69954 and remove pdo_mysql.cache_size and mysqli.cache_size INI directives
This patch removes some non working links to PHP manual and removes the
pdo_mysql.cache_size and mysqli.cache_size INI directives which have been
removed since PHP 5.3.0.
2017-10-23 09:11:16 +01:00
Kalle Sommer Nielsen
a398df3e36 Removed Bird(broken)step support from ODBC 2017-07-19 10:19:32 +02:00
Francois Laupretre
fe5c8f2b80 Allow loading PHP and Zend extensions by name
Allow extension name as INI 'extension=' and dl() argument
No BC break, as file name is still accepted.
When using the '-z' command line option (CLI/CGI), an absolute file name must still be provided (nothing changed here)
Change comments in example INI files
2017-06-22 12:58:15 -04:00
Nikita Popov
e2a2e49063 Merge branch 'PHP-7.1' 2017-06-02 23:36:44 +02:00
Nikita Popov
e9ff1fac85 Revert "merge PR #2290: enable opcache in CLI in 7.1+"
This reverts commit 71fe529afc.

Without the file cache (which is not enabled by default), this has
non-trivial impact on the startup time. It also significantly
increases the baseline memory usage of PHP on CLI.
2017-06-02 23:36:20 +02:00
ekinhbayar
47a1ab36b0
Update php.ini-* for deprecated track_errors directive 2017-05-08 05:47:52 +01:00
Nikita Popov
8aa419c91c Merge branch 'PHP-7.1' 2017-04-02 01:08:42 +02:00
Nikita Popov
32dcc1eef0 Merge branch 'PHP-7.0' into PHP-7.1 2017-04-02 01:08:24 +02:00
Martin Hujer
670041b60e Fix opcache.max_accelerated_files doc in php.ini
As stated in docs: https://secure.php.net/manual/en/opcache.configuration.php#ini.opcache.max-accelerated-files, the maximum is now 1000000
> The maximum value is 100000 in PHP < 5.5.6, and 1000000 in later versions.
2017-04-02 01:05:26 +02:00
adrian5
edfa87ebf5 Add comma to comment in php.ini 2017-03-16 12:23:55 +01:00
Joe Watkins
62f29c0c1c
Merge branch 'PHP-7.1'
* PHP-7.1:
  added a note to opache.fast_shutdown why its not enabled by default in php.ini
2017-01-11 11:18:38 +00:00
Joe Watkins
6fbd61a819
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  added a note to opache.fast_shutdown why its not enabled by default in php.ini
2017-01-11 11:18:26 +00:00
Markus Staab
ef42f49470
added a note to opache.fast_shutdown why its not enabled by default in php.ini 2017-01-11 11:18:10 +00:00
Joe Watkins
28f2959b83
Revert "set more suitable defaults for opcache in ini and code"
This reverts commit b655f2d632.

This has been deemed unsuitable for 7.0
2017-01-09 17:08:07 +00:00
Joe Watkins
4e99d3031f
Merge branch 'PHP-7.1'
* PHP-7.1:
  merge PR #2290: enable opcache in CLI in 7.1+
2017-01-09 11:00:37 +00:00
Joe Watkins
71fe529afc
merge PR #2290: enable opcache in CLI in 7.1+ 2017-01-09 11:00:05 +00:00
Joe Watkins
cde08d499b
Merge branch 'PHP-7.1'
* PHP-7.1:
  set more suitable defaults for opcache in ini and code
2017-01-09 10:57:29 +00:00
Joe Watkins
9727e37cae
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  set more suitable defaults for opcache in ini and code
2017-01-09 10:56:54 +00:00
Markus Staab
b655f2d632
set more suitable defaults for opcache in ini and code 2017-01-09 10:53:23 +00:00
Joe Watkins
c9abe878b5
Merge branch 'PHP-7.1'
* PHP-7.1:
  Increase realpath_cache_size default value
  add UPGRADING note for realpath_cache_size
2017-01-06 05:32:12 +00:00
Joe Watkins
d5a1c5a96b
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  Increase realpath_cache_size default value
  add UPGRADING note for realpath_cache_size
2017-01-06 05:31:29 +00:00
Joe Watkins
8a6d3d3d2e
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  Increase realpath_cache_size default value
2017-01-06 05:27:04 +00:00
Markus Staab
81fb61f97c
Update php.ini-production 2017-01-06 05:25:10 +00:00
Leigh
ff8fbf41c1 Merge branch 'master' into remove-mcrypt 2016-12-12 12:23:50 +00:00
Yasuo Ohgaki
e837bc24ed Merge branch 'PHP-7.1'
* PHP-7.1:
  Fix typo in php.ini-* comment
2016-12-03 14:23:35 +09:00
Yasuo Ohgaki
0b204d60a4 Fix typo in php.ini-* comment 2016-12-03 14:23:05 +09:00
Remi Collet
ce7aeacaa1 Merge branch 'PHP-7.1'
* PHP-7.1:
  CS (no leading space in comment for config option)
2016-11-23 14:56:50 +01:00
Remi Collet
b9f4100291 CS (no leading space in comment for config option) 2016-11-23 14:56:39 +01:00
Anatol Belski
5d95dcdaab Merge branch 'PHP-7.1'
* PHP-7.1:
  update php.ini-* for bug #69090
  update php.ini-* according to changes for bug #69090
2016-11-21 22:59:59 +01:00
Anatol Belski
2f5e49bdeb Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  update php.ini-* for bug #69090
  update php.ini-* according to changes for bug #69090
2016-11-21 22:59:30 +01:00
Anatol Belski
914ff56cff update php.ini-* for bug #69090 2016-11-21 22:58:23 +01:00
Christoph M. Becker
e4ce353118 Merge branch 'PHP-7.1' 2016-11-18 14:31:25 +01:00
Christoph M. Becker
1c2f7fcce1 Merge branch 'PHP-7.0' into PHP-7.1 2016-11-18 14:30:57 +01:00
Christoph M. Becker
583a273849 Merge branch 'PHP-5.6' into PHP-7.0 2016-11-18 14:29:52 +01:00
Christoph M. Becker
e44deba1e9 Fix #64526: Add missing mysqlnd.* parameters to php.ini-* 2016-11-18 14:17:19 +01:00
Leigh
bc4676e050 Remove mcrypt 2016-10-04 13:20:36 +01:00
Christoph M. Becker
da69037b5f Merge branch 'PHP-7.1' 2016-09-26 18:45:53 +02:00
Christoph M. Becker
b3f4bc7592 Merge branch 'PHP-7.0' into PHP-7.1 2016-09-26 18:45:05 +02:00
Christoph M. Becker
5e102d5685 Merge branch 'PHP-5.6' into PHP-7.0 2016-09-26 18:43:03 +02:00
Christoph M. Becker
4f0960a800 Fix #53745: cgi.discard_path option is missing from php.ini
Also cgi.check_shebang_line has been missing.
2016-09-26 18:41:09 +02:00
Yasuo Ohgaki
66f0694c4a Merge branch 'PHP-7.1'
* PHP-7.1:
  Merge RFC: Session ID without hashing https://wiki.php.net/rfc/session-id-without-hashing
2016-08-12 12:31:45 +09:00
Yasuo Ohgaki
3467526a65 Merge RFC: Session ID without hashing
https://wiki.php.net/rfc/session-id-without-hashing
2016-08-12 12:31:02 +09:00
Kalle Sommer Nielsen
9fc0a5e049 msql > mysqli, use a better extension name as an example in php.ini, as we do not have msql support anymore (Sorry Rasmus!) 2016-08-11 05:11:17 +02:00
Kalle Sommer Nielsen
197051f3ab Remove sql.safe_mode
This is one of the last old and odd deprecated settings we still have in PHP, it was never fully implemented in all the database extensions and should probably have been gone back in 5.4, along with safe_mode. Although if my memory strikes me right, mysql was also supporting it back then, but not mysqli.

So far only interbase was supporting this feature, and the removal of it causes two effects for interbase:
 - CREATE DATABASE is now allowed no matter
 - The default database set by php.ini (ibase.default_db) is no longer forced

http://php.net/ini.core#ini.sql.safe-mode
2016-08-11 05:06:55 +02:00
Yasuo Ohgaki
a53a6b3fb4 Fix URL rewriter issues 2016-08-11 08:31:48 +09:00
Anatol Belski
0596a2561b Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  document file cache fallback ini directive
2016-07-29 13:07:43 +02:00
Anatol Belski
1666e80cb9 document file cache fallback ini directive 2016-07-29 13:04:51 +02:00
Christoph M. Becker
7e2c3a77c0 Merge branch 'PHP-5.6' into PHP-7.0 2016-07-21 16:50:37 +02:00
Pieter Hordijk
f813f43855 Removed incorrect (leftover?) sentence in ini
about mbstring or iconv output handler
2016-07-21 16:49:14 +02:00
Christoph M. Becker
8950fb42d9 Merge branch 'PHP-7.0' into PHP-7.1 2016-07-21 16:33:06 +02:00
Christoph M. Becker
bee362d5e3 Merge branch 'PHP-5.6' into PHP-7.0 2016-07-21 16:31:16 +02:00
Pieter Hordijk
82bfb090ac Removed incorrect (leftover?) sentence in ini
about mbstring or iconv output handler
2016-07-21 16:28:48 +02:00
Christoph M. Becker
73303b6c24 Merge branch 'pull-request/1945' 2016-07-03 12:33:27 +02:00
Jakub Zelenka
158b537c99 Change default for serialize_precision to -1 (use mode 0) 2016-06-26 13:41:22 +01:00
Christoph M. Becker
c0efb06ee6 Change default gd.jpeg_ignore_warning = 1
Ignoring these warnings apparently works fine (libgd does so in
gdImageCreateJpeg()), but not ignoring them may cause imagecreatefromjpeg()
to fail completely, so it seems reasonable to ignore warnings by default.

Note that this change most likely doesn't constitute a BC break; we're
simply being more resilient with regard to slightly broken JPEGs.

See also the related [bug #72404](https://bugs.php.net/bug.php?id=72404).
2016-06-15 14:00:18 +02:00
Christoph M. Becker
5d57e25579 Fix #71554: FTP has not built-in support 2016-06-12 13:22:02 +02:00
Anatol Belski
f152c3fa57 Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
  Fixed bug #64524 Add intl.use_exceptions to php.ini-*
2016-05-08 15:12:20 +02:00
Anatol Belski
41b159fd11 Fixed bug #64524 Add intl.use_exceptions to php.ini-* 2016-05-08 15:09:50 +02:00
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
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
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
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
Pierre Joye
9805e1674a - remove magic quotes support, functions are kept (see the NEWS entry for the details) for BC reasons but do not allow to set enable MQ 2011-07-22 11:25:30 +00:00
Pierre Joye
cc1c7af037 - remove magic quotes support, functions are kept (see the NEWS entry for the details) for BC reasons but do not allow to set enable MQ 2011-07-22 11:25:30 +00:00
Pierre Joye
ecfc54c5e6 - cleanup 2011-07-19 12:02:22 +00:00
Pierre Joye
8ebba9c69d - cleanup 2011-07-19 12:02:22 +00:00
Pierrick Charron
1368364469 Fix common typos in the source code (Reported in Bug #54065)
# External libraries were excluded
# Thanks eitan at eitanadler dot com for the first patch :)
2011-04-03 21:46:52 +00:00
Gustavo André dos Santos Lopes
5fad615ff5 - Changed php.ini files to match the hard-coded default for serialize_precision. 2011-02-09 00:25:44 +00:00
Gustavo André dos Santos Lopes
efa9a8ee53 - Changed php.ini files to match the hard-coded default for serialize_precision. 2011-02-09 00:25:44 +00:00
Adam Harvey
39210df0ed Implement request #53684 (Deprecated HTML in sample php.ini). 2011-01-07 03:43:20 +00:00
Adam Harvey
abf0ea0110 Implement request #53684 (Deprecated HTML in sample php.ini). 2011-01-07 03:43:20 +00:00
Moriyoshi Koizumi
b0f8ac5299 - Update ini descriptions. It is still possible that zend.multibyte will be removed in the near future as it is confirmed to not impose any significant overhead with the standard configuration even when it is enabled. 2010-12-21 06:57:46 +00:00
Gustavo André dos Santos Lopes
c8622a07f5 - Adding enable_post_data_reading to php.ini-* 2010-12-16 11:27:17 +00:00
Jani Taskinen
ab80d4e4b7 - $_REQUEST is also JIT global now 2010-12-14 15:42:22 +00:00
Pierre Joye
269a6b09a3 -add a link to snmp install doc about the MIBS data, remove static or removed exts 2010-12-13 21:07:13 +00:00
Pierre Joye
acd87493ec -add a link to snmp install doc about the MIBS data, remove static or removed exts 2010-12-13 21:07:13 +00:00
Pierre Joye
cba0322c81 - not anymore in core or builtin 2010-12-07 23:53:51 +00:00
Adam Harvey
7111501381 Update INI files per doc bug #53420 (mail.log is poorly documented). 2010-11-29 03:44:56 +00:00