From 1e92b24a2aeedfe7679f2d5d92b5cfdb363b549b Mon Sep 17 00:00:00 2001 From: Chris McCafferty Date: Sun, 9 Nov 2014 22:30:51 -0500 Subject: [PATCH 1/2] 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. --- php.ini-development | 4 ++-- php.ini-production | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/php.ini-development b/php.ini-development index bcc9ac6baf3..d29cc808d2a 100644 --- a/php.ini-development +++ b/php.ini-development @@ -678,7 +678,7 @@ auto_append_file = ; http://php.net/default-mimetype default_mimetype = "text/html" -; PHP's default character set is set to UTF-8 +; PHP's default character set is set to UTF-8. ; http://php.net/default-charset default_charset = "UTF-8" @@ -764,7 +764,7 @@ enable_dl = Off ; will look for to know it is OK to continue execution. Setting this variable MAY ; cause security issues, KNOW WHAT YOU ARE DOING FIRST. ; http://php.net/cgi.redirect-status-env -;cgi.redirect_status_env = +;cgi.redirect_status_env = ; cgi.fix_pathinfo provides *real* PATH_INFO/PATH_TRANSLATED support for CGI. PHP's ; previous behaviour was to set PATH_TRANSLATED to SCRIPT_FILENAME, and to not grok diff --git a/php.ini-production b/php.ini-production index a2a50ea2f8a..d886985b859 100644 --- a/php.ini-production +++ b/php.ini-production @@ -678,7 +678,7 @@ 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" @@ -688,10 +688,12 @@ default_charset = "UTF-8" ;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 From 48c0cf7df6c5fd11148c8a5a9b6362fd99dea4e3 Mon Sep 17 00:00:00 2001 From: Peter Cowburn Date: Wed, 19 Nov 2014 17:03:15 +0000 Subject: [PATCH 2/2] NEWS --- NEWS | 2 ++ 1 file changed, 2 insertions(+) diff --git a/NEWS b/NEWS index 7de8c7ad045..cf148e5e5fa 100644 --- a/NEWS +++ b/NEWS @@ -6,6 +6,8 @@ PHP NEWS . Fixed bug #68370 ("unset($this)" can make the program crash). (Laruence) . Fixed bug #68104 (Segfault while pre-evaluating a disabled function). (Laruence) + . Fixed bug #68355 (Inconsistency in example php.ini comments). + (Chris McCafferty) - FPM: . Fixed bug #68420 (listen=9000 listens to ipv6 localhost instead of all