Commit Graph

263 Commits

Author SHA1 Message Date
Nikita Popov
8582e53430 Merge branch 'PHP-7.2' 2018-05-26 22:06:52 +02:00
Nikita Popov
4455899a93 Merge branch 'PHP-7.1' into PHP-7.2 2018-05-26 22:06:44 +02:00
Peter Kokot
974c46b89b Add missing opcache.opt_debug_level ini directive 2018-05-26 22:04:20 +02:00
Christoph M. Becker
129dd521bb Merge branch 'PHP-7.2'
* PHP-7.2:
  Fix #74139: mail.add_x_header default inconsistent with docs [ci skip]
2018-03-14 00:01:46 +01:00
Christoph M. Becker
7448b03300 Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
  Fix #74139: mail.add_x_header default inconsistent with docs [ci skip]
2018-03-13 23:56:31 +01:00
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
Nikita Popov
c61daf415d Deprecate track_errors / $php_errormsg 2017-02-03 21:02:52 +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
49b2cbf763
Update php.ini-development 2017-01-06 05:25:13 +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