From b6ceea4a25f667bfed6c26899dd55a274a3270d3 Mon Sep 17 00:00:00 2001 From: Christopher Jones Date: Mon, 21 Oct 2013 14:20:35 -0700 Subject: Fixed bug #65939 (Space before ";" breaks php.ini parsing). (brainstorm at nopcode dot org) --- php.ini-development | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'php.ini-development') diff --git a/php.ini-development b/php.ini-development index 630f9e94e5..2ef47a40a2 100644 --- a/php.ini-development +++ b/php.ini-development @@ -1907,7 +1907,7 @@ ldap.max_links = -1 ;opcache.revalidate_path=0 ; If disabled, all PHPDoc comments are dropped from the code to reduce the - ;size of the optimized code. +; size of the optimized code. ;opcache.save_comments=1 ; If disabled, PHPDoc comments are not loaded from SHM, so "Doc Comments" -- cgit v1.2.1 From bc1c2b3b316d58ea4450c957aaf6e612bd03847e Mon Sep 17 00:00:00 2001 From: Michael Wallner Date: Thu, 12 Dec 2013 11:33:06 +0100 Subject: remove always_populate_raw_post_data INI entries from master, UPGRADING.INTERNALS coming shortly --- php.ini-development | 6 ------ 1 file changed, 6 deletions(-) (limited to 'php.ini-development') diff --git a/php.ini-development b/php.ini-development index 2a01555b7f..df39e42140 100644 --- a/php.ini-development +++ b/php.ini-development @@ -692,12 +692,6 @@ default_mimetype = "text/html" ; http://php.net/default-charset ;default_charset = "UTF-8" -; Always populate the $HTTP_RAW_POST_DATA variable. PHP's default behavior is -; to disable this feature. If post reading is disabled through -; enable_post_data_reading, $HTTP_RAW_POST_DATA is *NOT* populated. -; http://php.net/always-populate-raw-post-data -;always_populate_raw_post_data = On - ;;;;;;;;;;;;;;;;;;;;;;;;; ; Paths and Directories ; ;;;;;;;;;;;;;;;;;;;;;;;;; -- cgit v1.2.1 From feb4caad095313e905990359d93fde57c4c4c328 Mon Sep 17 00:00:00 2001 From: Michael Wallner Date: Tue, 10 Dec 2013 16:28:51 +0100 Subject: update php.ini-* --- php.ini-development | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'php.ini-development') diff --git a/php.ini-development b/php.ini-development index 2a01555b7f..4fbd07f0a0 100644 --- a/php.ini-development +++ b/php.ini-development @@ -693,10 +693,11 @@ default_mimetype = "text/html" ;default_charset = "UTF-8" ; Always populate the $HTTP_RAW_POST_DATA variable. PHP's default behavior is -; to disable this feature. If post reading is disabled through -; enable_post_data_reading, $HTTP_RAW_POST_DATA is *NOT* populated. +; to disable this feature and it will be removed in a future version. +; If post reading is disabled through enable_post_data_reading, +; $HTTP_RAW_POST_DATA is *NOT* populated. ; http://php.net/always-populate-raw-post-data -;always_populate_raw_post_data = On +;always_populate_raw_post_data = -1 ;;;;;;;;;;;;;;;;;;;;;;;;; ; Paths and Directories ; -- cgit v1.2.1 From 4dee63ca1cb650f96c227d9169787f70b0c86bd9 Mon Sep 17 00:00:00 2001 From: Yasuo Ohgaki Date: Mon, 27 Jan 2014 18:41:31 +0900 Subject: Remove obsolete description --- php.ini-development | 35 ----------------------------------- 1 file changed, 35 deletions(-) (limited to 'php.ini-development') diff --git a/php.ini-development b/php.ini-development index b935f22eb5..962010746b 100644 --- a/php.ini-development +++ b/php.ini-development @@ -138,16 +138,6 @@ ; Development Value: "GP" ; Production Value: "GP" -; session.bug_compat_42 -; Default Value: On -; Development Value: On -; Production Value: Off - -; session.bug_compat_warn -; Default Value: On -; Development Value: On -; Production Value: Off - ; session.gc_divisor ; Default Value: 100 ; Development Value: 1000 @@ -1476,31 +1466,6 @@ session.gc_maxlifetime = 1440 ; setting session.gc_maxlifetime to 1440 (1440 seconds = 24 minutes): ; find /path/to/sessions -cmin +24 -type f | xargs rm -; PHP 4.2 and less have an undocumented feature/bug that allows you to -; to initialize a session variable in the global scope. -; PHP 4.3 and later will warn you, if this feature is used. -; You can disable the feature and the warning separately. At this time, -; the warning is only displayed, if bug_compat_42 is enabled. This feature -; introduces some serious security problems if not handled correctly. It's -; recommended that you do not use this feature on production servers. But you -; should enable this on development servers and enable the warning as well. If you -; do not enable the feature on development servers, you won't be warned when it's -; used and debugging errors caused by this can be difficult to track down. -; Default Value: On -; Development Value: On -; Production Value: Off -; http://php.net/session.bug-compat-42 -session.bug_compat_42 = On - -; This setting controls whether or not you are warned by PHP when initializing a -; session value into the global space. session.bug_compat_42 must be enabled before -; these warnings can be issued by PHP. See the directive above for more information. -; Default Value: On -; Development Value: On -; Production Value: Off -; http://php.net/session.bug-compat-warn -session.bug_compat_warn = On - ; Check HTTP Referer to invalidate externally stored URLs containing ids. ; HTTP_REFERER has to contain this substring for the session to be ; considered as valid. -- cgit v1.2.1 From cbd108abf19d9fb9ae1d4ccd153215f56a2763e8 Mon Sep 17 00:00:00 2001 From: Yasuo Ohgaki Date: Thu, 13 Feb 2014 11:54:52 +0900 Subject: Implement RFC https://wiki.php.net/rfc/default_encoding --- php.ini-development | 59 +++++++++++++++++++++++++++++++++++++++++------------ 1 file changed, 46 insertions(+), 13 deletions(-) (limited to 'php.ini-development') diff --git a/php.ini-development b/php.ini-development index 0ca81e8ffe..50fbba1fcf 100644 --- a/php.ini-development +++ b/php.ini-development @@ -678,9 +678,26 @@ auto_append_file = ; http://php.net/default-mimetype default_mimetype = "text/html" -; PHP's default character set is set to empty. +; PHP's default character set is set to UTF-8 ; http://php.net/default-charset -;default_charset = "UTF-8" +default_charset = "UTF-8" + +; PHP internal character encoding is set to empty. +; If empty, default_charset is used. +; http://php.net/internal-encoding +;internal_encoding = + +; PHP input character encoding is set to empty. +; If empty, default_charset is used. +; http://php.net/input-encoding +;input_encoding = + +; PHP output character encoding is set to empty. +; If empty, default_charset is used. +; mbstring or iconv output handler is used. +; See also output_buffer. +; http://php.net/output-encoding +;output_encoding = ; Always populate the $HTTP_RAW_POST_DATA variable. PHP's default behavior is ; to disable this feature and it will be removed in a future version. @@ -932,9 +949,17 @@ cli_server.color = On ;filter.default_flags = [iconv] -;iconv.input_encoding = ISO-8859-1 -;iconv.internal_encoding = ISO-8859-1 -;iconv.output_encoding = ISO-8859-1 +; Use of this INI entory is deprecated, use global input_encoding instead. +; If empty, input_encoding is used. +;iconv.input_encoding = + +; Use of this INI entory is deprecated, use global internal_encoding instead. +; If empty, internal_encoding is used. +;iconv.internal_encoding = + +; Use of this INI entory is deprecated, use global output_encoding instead. +; If empty, output_encoding is used. +;iconv.output_encoding = [intl] ;intl.default_locale = @@ -1697,23 +1722,30 @@ mssql.secure_connection = Off [mbstring] ; language for internal character representation. +; This affects mb_send_mail() and mbstrig.detect_order. ; http://php.net/mbstring.language ;mbstring.language = Japanese +; Use of this INI entory is deprecated, use global internal_encoding instead. ; internal/script encoding. -; Some encoding cannot work as internal encoding. -; (e.g. SJIS, BIG5, ISO-2022-*) +; Some encoding cannot work as internal encoding. (e.g. SJIS, BIG5, ISO-2022-*) +; If empty, default_charset or internal_encoding is used in order. ; http://php.net/mbstring.internal-encoding -;mbstring.internal_encoding = UTF-8 +;mbstring.internal_encoding = +; Use of this INI entory is deprecated, use global input_encoding instead. ; http input encoding. +; If empty, input_encoding is used. +; mbstring.encoding_traslation = On is needed to use this setting. ; http://php.net/mbstring.http-input -;mbstring.http_input = UTF-8 +;mbstring.http_input = -; http output encoding. mb_output_handler must be -; registered as output buffer to function +; Use of this INI entory is deprecated, use global output_encoding instead. +; http output encoding. +; mb_output_handler must be registered as output buffer to function. +; If empty, output_encoding is used. ; http://php.net/mbstring.http-output -;mbstring.http_output = pass +;mbstring.http_output = ; enable automatic encoding translation according to ; mbstring.internal_encoding setting. Input chars are @@ -1724,7 +1756,7 @@ mssql.secure_connection = Off ;mbstring.encoding_translation = Off ; automatic encoding detection order. -; auto means +; "auto" detect order is changed accoding to mbstring.language ; http://php.net/mbstring.detect-order ;mbstring.detect_order = auto @@ -1745,6 +1777,7 @@ mssql.secure_connection = Off ;mbstring.func_overload = 0 ; enable strict encoding detection. +; Default: Off ;mbstring.strict_detection = On ; This directive specifies the regex pattern of content types for which mb_output_handler() -- cgit v1.2.1 From ff3c6931c0b3c275127ec8a73ad82fa2f9ff527c Mon Sep 17 00:00:00 2001 From: Daniel Lowrey Date: Fri, 7 Mar 2014 05:26:37 -0700 Subject: Update php.ini files (new openssl directives) --- php.ini-development | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) (limited to 'php.ini-development') diff --git a/php.ini-development b/php.ini-development index 50fbba1fcf..8d2c6697b1 100644 --- a/php.ini-development +++ b/php.ini-development @@ -1967,6 +1967,24 @@ ldap.max_links = -1 ; absolute path. ;curl.cainfo = +[openssl] +; The location of a Certificate Authority (CA) file on the local filesystem +; to use when verifying the identity of SSL/TLS peers. Most users should +; not specify a value for this directive as PHP will attempt to use the +; OS-managed cert stores in its absence. If specified, this value may still +; be overridden on a per-stream basis via the "cafile" SSL stream context +; option. +;openssl.cafile= + +; If openssl.cafile is not specified or if the CA file is not found, the +; directory pointed to by openssl.capath is searched for a suitable +; certificate. This value must be a correctly hashed certificate directory. +; Most users should not specify a value for this directive as PHP will +; attempt to use the OS-managed cert stores in its absence. If specified, +; this value may still be overridden on a per-stream basis via the "capath" +; SSL stream context option. +;openssl.capath= + ; Local Variables: ; tab-width: 4 ; End: -- cgit v1.2.1 From 6e16cc3528cbf36437aa037e7b98ec41ace7eb72 Mon Sep 17 00:00:00 2001 From: Lior Kaplan Date: Sun, 9 Mar 2014 22:58:04 +0200 Subject: Fix typo: entory -> entry --- php.ini-development | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'php.ini-development') diff --git a/php.ini-development b/php.ini-development index 8d2c6697b1..c5196b4c87 100644 --- a/php.ini-development +++ b/php.ini-development @@ -949,15 +949,15 @@ cli_server.color = On ;filter.default_flags = [iconv] -; Use of this INI entory is deprecated, use global input_encoding instead. +; Use of this INI entry is deprecated, use global input_encoding instead. ; If empty, input_encoding is used. ;iconv.input_encoding = -; Use of this INI entory is deprecated, use global internal_encoding instead. +; Use of this INI entry is deprecated, use global internal_encoding instead. ; If empty, internal_encoding is used. ;iconv.internal_encoding = -; Use of this INI entory is deprecated, use global output_encoding instead. +; Use of this INI entry is deprecated, use global output_encoding instead. ; If empty, output_encoding is used. ;iconv.output_encoding = @@ -1726,21 +1726,21 @@ mssql.secure_connection = Off ; http://php.net/mbstring.language ;mbstring.language = Japanese -; Use of this INI entory is deprecated, use global internal_encoding instead. +; Use of this INI entry is deprecated, use global internal_encoding instead. ; internal/script encoding. ; Some encoding cannot work as internal encoding. (e.g. SJIS, BIG5, ISO-2022-*) ; If empty, default_charset or internal_encoding is used in order. ; http://php.net/mbstring.internal-encoding ;mbstring.internal_encoding = -; Use of this INI entory is deprecated, use global input_encoding instead. +; Use of this INI entry is deprecated, use global input_encoding instead. ; http input encoding. ; If empty, input_encoding is used. ; mbstring.encoding_traslation = On is needed to use this setting. ; http://php.net/mbstring.http-input ;mbstring.http_input = -; Use of this INI entory is deprecated, use global output_encoding instead. +; Use of this INI entry is deprecated, use global output_encoding instead. ; http output encoding. ; mb_output_handler must be registered as output buffer to function. ; If empty, output_encoding is used. -- cgit v1.2.1 From a28389b2ab890058cab541ec92e2d53f4b5faf3f Mon Sep 17 00:00:00 2001 From: Yasuo Ohgaki Date: Tue, 18 Mar 2014 07:27:45 +0900 Subject: Fixed typo in UPGRADING and modified php.ini-* description for encoding related changes --- php.ini-development | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) (limited to 'php.ini-development') diff --git a/php.ini-development b/php.ini-development index c5196b4c87..ac60db901f 100644 --- a/php.ini-development +++ b/php.ini-development @@ -950,15 +950,20 @@ cli_server.color = On [iconv] ; Use of this INI entry is deprecated, use global input_encoding instead. -; If empty, input_encoding is used. +; If empty, default_charset or input_encoding or iconv.input_encoding is used. +; The precedence is: default_charset < intput_encoding < iconv.input_encoding ;iconv.input_encoding = ; Use of this INI entry is deprecated, use global internal_encoding instead. -; If empty, internal_encoding is used. +; If empty, default_charset or internal_encoding or iconv.internal_encoding is used. +; The precedence is: default_charset < internal_encoding < iconv.internal_encoding ;iconv.internal_encoding = ; Use of this INI entry is deprecated, use global output_encoding instead. -; If empty, output_encoding is used. +; If empty, default_charset or output_encoding or iconv.output_encoding is used. +; The precedence is: default_charset < output_encoding < iconv.output_encoding +; To use an output encoding conversion, iconv's output handler must be set +; otherwise output encoding conversion cannot be performed. ;iconv.output_encoding = [intl] @@ -1729,21 +1734,25 @@ mssql.secure_connection = Off ; Use of this INI entry is deprecated, use global internal_encoding instead. ; internal/script encoding. ; Some encoding cannot work as internal encoding. (e.g. SJIS, BIG5, ISO-2022-*) -; If empty, default_charset or internal_encoding is used in order. -; http://php.net/mbstring.internal-encoding +; If empty, default_charset or internal_encoding or iconv.internal_encoding is used. +; The precedence is: default_charset < internal_encoding < iconv.internal_encoding ;mbstring.internal_encoding = ; Use of this INI entry is deprecated, use global input_encoding instead. ; http input encoding. -; If empty, input_encoding is used. ; mbstring.encoding_traslation = On is needed to use this setting. +; If empty, default_charset or input_encoding or mbstring.input is used. +; The precedence is: default_charset < intput_encoding < mbsting.http_input ; http://php.net/mbstring.http-input ;mbstring.http_input = ; Use of this INI entry is deprecated, use global output_encoding instead. ; http output encoding. ; mb_output_handler must be registered as output buffer to function. -; If empty, output_encoding is used. +; If empty, default_charset or output_encoding or mbstring.http_output is used. +; The precedence is: default_charset < output_encoding < mbstring.http_output +; To use an output encoding conversion, mbstring's output handler must be set +; otherwise output encoding conversion cannot be performed. ; http://php.net/mbstring.http-output ;mbstring.http_output = -- cgit v1.2.1 From 95c57bb646d141d42bcadedfe0daac8c582b1a64 Mon Sep 17 00:00:00 2001 From: Anatol Belski Date: Mon, 14 Apr 2014 09:32:31 +0200 Subject: Fixed bug #67033 Remove reference to Windows 95 --- php.ini-development | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'php.ini-development') diff --git a/php.ini-development b/php.ini-development index 962010746b..cba0679c27 100644 --- a/php.ini-development +++ b/php.ini-development @@ -573,7 +573,7 @@ html_errors = On ; http://php.net/error-log ; Example: ;error_log = php_errors.log -; Log errors to syslog (Event Log on NT, not valid in Windows 95). +; Log errors to syslog (Event Log on Windows). ;error_log = syslog ;windows.show_crt_warning @@ -1010,7 +1010,7 @@ mail.add_x_header = On ; The path to a log file that will log all mail() calls. Log entries include ; the full path of the script, line number, To address and headers. ;mail.log = -; Log mail to syslog (Event Log on NT, not valid in Windows 95). +; Log mail to syslog (Event Log on Windows). ;mail.log = syslog [SQL] -- cgit v1.2.1 From cf0303e7824c3e20e9db240f9d4e4b154cc2a72d Mon Sep 17 00:00:00 2001 From: Florian MARGAINE Date: Sat, 20 Sep 2014 10:01:44 +0200 Subject: Replaces php5 with php7, without whitespace changes. --- php.ini-development | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'php.ini-development') diff --git a/php.ini-development b/php.ini-development index 562816fc44..41460485c7 100644 --- a/php.ini-development +++ b/php.ini-development @@ -867,8 +867,8 @@ default_socket_timeout = 60 ; ; Windows Extensions ; Note that ODBC support is built in, so no dll is needed for it. -; Note that many DLL files are located in the extensions/ (PHP 4) ext/ (PHP 5) -; extension folders as well as the separate PECL DLL download (PHP 5). +; Note that many DLL files are located in the extensions/ (PHP 4) ext/ (PHP 5+) +; extension folders as well as the separate PECL DLL download (PHP 5+). ; Be sure to appropriately set the extension_dir directive. ; ;extension=php_bz2.dll -- cgit v1.2.1 From 876792c756180bc62ae25b0b2c74b1484097b177 Mon Sep 17 00:00:00 2001 From: Sebastian Zartner Date: Tue, 23 Sep 2014 07:45:03 +0200 Subject: Fixed typo --- php.ini-development | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'php.ini-development') diff --git a/php.ini-development b/php.ini-development index 148d194fef..bcc9ac6baf 100644 --- a/php.ini-development +++ b/php.ini-development @@ -1765,7 +1765,7 @@ mssql.secure_connection = Off ;mbstring.encoding_translation = Off ; automatic encoding detection order. -; "auto" detect order is changed accoding to mbstring.language +; "auto" detect order is changed according to mbstring.language ; http://php.net/mbstring.detect-order ;mbstring.detect_order = auto -- cgit v1.2.1 From e756333bbb0dd1496ee8f51044b104f3a997aa5f Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Tue, 9 Sep 2014 23:14:19 +0200 Subject: Remove <% and /i closing tag * asp_tags ini directive --- php.ini-development | 4 ---- 1 file changed, 4 deletions(-) (limited to 'php.ini-development') diff --git a/php.ini-development b/php.ini-development index 594ddb6ceb..61519f05aa 100644 --- a/php.ini-development +++ b/php.ini-development @@ -201,10 +201,6 @@ engine = On ; http://php.net/short-open-tag short_open_tag = Off -; Allow ASP-style <% %> tags. -; http://php.net/asp-tags -asp_tags = Off - ; The number of significant digits displayed in floating point numbers. ; http://php.net/precision precision = 14 -- cgit v1.2.1