mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-01-08 12:04:24 +08:00
Code Issues Packages Projects Releases Wiki Activity
113,148 Commits 505 Branches 1,389 Tags 845 MiB
aee31dd7e4
Commit Graph

304 Commits

Author SHA1 Message Date
Christoph M. Becker
25f324fad7 Fix #74139: mail.add_x_header default inconsistent with docs [ci skip] 
mail.add_x_header actually defaults to `Off`, so we should use this
default in the provided `php.ini`s.
 2018-03-13 23:54:42 +01:00
Christoph M. Becker
62329ef5f0 Merge branch 'PHP-7.2' 
* PHP-7.2:
  Fix #76088: ODBC functions are not available by default on Windows
 2018-03-13 14:34:26 +01:00
Christoph M. Becker
b2622ed838 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fix #76088: ODBC functions are not available by default on Windows
 2018-03-13 14:33:20 +01:00
Christoph M. Becker
cab354debd Fix #76088: ODBC functions are not available by default on Windows 2018-03-13 14:30:43 +01:00
sundarchi1
7711ac78d9 Sync opcache.optimization_level default value 
The default value is 0x7FFFBFFF nowadays, disabling constant
propagation.
 2018-02-10 19:04:13 +01:00
Michael Smith
58c778ba60 Fix spelling and grammar mistakes in php.ini files 
The spelling of input_encoding is incorrect in both the php.ini-production
and php.ini-development, as of March, 2014. This fixes the spelling.

Cleaning up spelling and grammar includes wrapping lines to 80 characters,
adding articles such as 'the', and fixing spellings such as pathes to
paths.
 2018-02-02 22:33:24 +01:00
Kalle Sommer Nielsen
44c5dea9d6 Kill the references to C:\winnt (Windows 2000), which we don't support, also remove the note about Windows NT based OS, as we only support NT anyway 2018-01-04 08:11:34 +01:00
Nikita Popov
e512305581 Remove opcache.inherited_hack 
This ini directive has already been ignored since PHP 5.3.
 2017-12-18 22:00:54 +01:00
Nikita Popov
8cced30a6a Merge branch 'PHP-7.2' 
[ci skip]
 2017-12-18 21:45:07 +01:00
Nikita Popov
a1d2bf831f Document removal of opcache.fast_shutdown 
[ci skip]
 2017-12-18 21:44:48 +01:00
sundarchi1
ca21ba3f82 Make ini formatting more consistent 
Default values should have no leading space, everything else should
have one.
 2017-12-09 18:36:36 +01:00
Joe Watkins
4a6f83fe6f
Merge branch 'PHP-7.2' 
* PHP-7.2:
  Fix bug #69954 and remove pdo_mysql.cache_size and mysqli.cache_size INI directives
 2017-10-23 09:12:30 +01:00
Joe Watkins
ca77eacbc1
Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fix bug #69954 and remove pdo_mysql.cache_size and mysqli.cache_size INI directives
 2017-10-23 09:12:06 +01:00
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