Commit graph

292 commits

Author SHA1 Message Date
Christoph M. Becker
2b54140b72 Merge branch 'PHP-7.4'
* PHP-7.4:
  Fix #76956: Wrong value for 'syslog.filter' documented in php.ini
2019-03-18 10:21:38 +01:00
Christoph M. Becker
e0e5d26c9c Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
  Fix #76956: Wrong value for 'syslog.filter' documented in php.ini
2019-03-18 10:20:41 +01:00
Christoph M. Becker
ad2d2e41de Fix #76956: Wrong value for 'syslog.filter' documented in php.ini 2019-03-18 10:19:30 +01:00
Christoph M. Becker
dd6911550f Merge branch 'PHP-7.4'
* PHP-7.4:
  SQLite3: add DEFENSIVE config for SQLite >= 3.26.0 as a mitigation strategy against potential security flaws
2019-03-11 16:32:16 +01:00
Christoph M. Becker
aefe0dfd61 Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
  SQLite3: add DEFENSIVE config for SQLite >= 3.26.0 as a mitigation strategy against potential security flaws
2019-03-11 16:31:26 +01:00
Christoph M. Becker
e7ce7c6bb2 Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
  SQLite3: add DEFENSIVE config for SQLite >= 3.26.0 as a mitigation strategy against potential security flaws
2019-03-11 16:30:16 +01:00
bohwaz
e93259bb23 SQLite3: add DEFENSIVE config for SQLite >= 3.26.0 as a mitigation strategy against potential security flaws 2019-03-11 16:26:15 +01:00
Kalle Sommer Nielsen
fddc751024 Removed pdo_odbc.db2_instance_name 2019-03-01 01:24:53 +02:00
Peter Kokot
623911f993 Merge branch 'PHP-7.4'
* PHP-7.4:
  Remove local variables
2019-02-03 21:23:18 +01:00
Peter Kokot
92ac598aab Remove local variables
This patch removes the so called local variables defined per
file basis for certain editors to properly show tab width, and
similar settings. These are mainly used by Vim and Emacs editors
yet with recent changes the once working definitions don't work
anymore in Vim without custom plugins or additional configuration.
Neither are these settings synced across the PHP code base.

A simpler and better approach is EditorConfig and fixing code
using some code style fixing tools in the future instead.

This patch also removes the so called modelines for Vim. Modelines
allow Vim editor specifically to set some editor configuration such as
syntax highlighting, indentation style and tab width to be set in the
first line or the last 5 lines per file basis. Since the php test
files have syntax highlighting already set in most editors properly and
EditorConfig takes care of the indentation settings, this patch removes
these as well for the Vim 6.0 and newer versions.

With the removal of local variables for certain editors such as
Emacs and Vim, the footer is also probably not needed anymore when
creating extensions using ext_skel.php script.

Additionally, Vim modelines for setting php syntax and some editor
settings has been removed from some *.phpt files.  All these are
mostly not relevant for phpt files neither work properly in the
middle of the file.
2019-02-03 21:03:00 +01:00
Nikita Popov
9bc2cacf7f Remove special treatment of strings in asserts
This was deprecated in PHP 7.2 as part of
https://wiki.php.net/rfc/deprecations_php_7_2.
2019-01-29 09:42:59 +01:00
Nikita Popov
331e56ce38 Remove mbstring.func_overload
Deprecated in PHP 7.2 as part of
https://wiki.php.net/rfc/deprecations_php_7_2.
2019-01-28 15:58:23 +01:00
Nikita Popov
920b4b249f Remove track_errors and $php_errormsg
This has been deprecated in PHP 7.2 as part of
https://wiki.php.net/rfc/deprecations_php_7_2.
2019-01-28 15:58:23 +01:00
Christoph M. Becker
467d8b3ff7 [ci skip] Add opcache.preload directive 2019-01-21 17:55:53 +01:00
Nikita Popov
38d0c5bacd Merge branch 'PHP-7.3'
[ci skip]
2019-01-14 11:50:09 +01:00
Nikita Popov
5c3b17ca68 Merge branch 'PHP-7.2' into PHP-7.3
[ci skip]
2019-01-14 11:49:58 +01:00
wbob
5ac9990ddf document open_basedir and realpath cache coupling in php.ini
[ci skip]
2019-01-14 11:49:45 +01:00
Dmitry Stogov
e089d506d5 Added FFI extension 2019-01-14 11:47:50 +03:00
Remi Collet
f2ac27e73c Merge branch 'PHP-7.3'
* PHP-7.3:
  add imap.enable_insecure_rsh in php.ini
2018-12-08 10:25:35 +01:00
Remi Collet
cb3a1df946 Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
  add imap.enable_insecure_rsh in php.ini
2018-12-08 10:25:20 +01:00
Remi Collet
fd0077bf06 Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
  add imap.enable_insecure_rsh in php.ini
2018-12-08 10:25:05 +01:00
Remi Collet
4288674651 add imap.enable_insecure_rsh in php.ini 2018-12-08 10:24:36 +01:00
Peter Kokot
37c329d715 Trim trailing whitespace in source code files 2018-10-13 14:17:28 +02:00
Peter Kokot
3362620b5f Trim trailing whitespace in source code files 2018-10-13 14:16:33 +02:00
Peter Kokot
902d39a3a7 Trim trailing whitespace in source code files 2018-10-13 14:14:50 +02:00
Tiffany
318b34da05 Update grammar and clarify wording in couple places
On line 512, I clarified the sentence which uses effect, previously the sentence was awkward.
On line 656, the wrong word is used, I changed affect to effect.
2018-09-03 22:04:37 +02:00
Frederik Bosch
08b9310e6d implement same site cookie see https://bugs.php.net/bug.php?id=72230 see https://tools.ietf.org/html/draft-west-first-party-cookies-07 see https://scotthelme.co.uk/csrf-is-dead/ 2018-07-31 12:40:24 +02:00
Jakub Zelenka
c85504386d Rename none syslog.filter to all and update ini description 2018-07-22 16:29:35 +01:00
Philip Prindeville
2010c02e5c Add syslog.filter INI for filtering syslog messages
Signed-off-by: Philip Prindeville <philipp@redfish-solutions.com>
2018-07-22 15:36:47 +01:00
Gemorroj
233cbb53b3 [ci skip] Update php.ini-production
remove duplicated strings
2018-07-14 13:32:46 +02:00
Jakub Zelenka
ce0721bee5 Update NEWS, UPGRADING and default php.ini files with syslog changes 2018-07-01 18:27:36 +01:00
Philip Prindeville
2475337bd8 Add syslog's ident and facility parameters to config
Signed-off-by: Philip Prindeville <philipp@redfish-solutions.com>
2018-07-01 18:08:07 +01:00
Christoph M. Becker
8bc2163c8a Add ext/sodium to php.ini-* 2018-06-30 14:52:30 +02:00
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