summaryrefslogtreecommitdiff
path: root/php.ini-development
diff options
context:
space:
mode:
authorPeter Cowburn <petercowburn@gmail.com>2014-11-19 17:06:59 +0000
committerPeter Cowburn <petercowburn@gmail.com>2014-11-19 17:06:59 +0000
commitf7674519804dc7000a56ef9fe12c49461ff0333a (patch)
tree01f7da663fb57f91bd4eb84583314f3cb1e02ba4 /php.ini-development
parentcf00c1b2e7efbf7954ada39d87b8de7f80d30570 (diff)
parent48c0cf7df6c5fd11148c8a5a9b6362fd99dea4e3 (diff)
downloadphp-git-f7674519804dc7000a56ef9fe12c49461ff0333a.tar.gz
Merge branch 'PHP-5.6'
* PHP-5.6: NEWS Fix #68355: Inconsistency in example php.ini comments
Diffstat (limited to 'php.ini-development')
-rw-r--r--php.ini-development4
1 files changed, 2 insertions, 2 deletions
diff --git a/php.ini-development b/php.ini-development
index 61519f05aa..a3cb5a3b78 100644
--- a/php.ini-development
+++ b/php.ini-development
@@ -674,7 +674,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"
@@ -753,7 +753,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