Skip to content

Commit 91ad40d

Browse files
committed
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3: Fixed bug #62128 superfluous ";"
2 parents 16a592b + c3547f1 commit 91ad40d

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

php.ini-development

+2-2
Original file line numberDiff line numberDiff line change
@@ -751,7 +751,7 @@ enable_dl = Off
751751
; will look for to know it is OK to continue execution. Setting this variable MAY
752752
; cause security issues, KNOW WHAT YOU ARE DOING FIRST.
753753
; http://php.net/cgi.redirect-status-env
754-
;cgi.redirect_status_env = ;
754+
;cgi.redirect_status_env =
755755

756756
; cgi.fix_pathinfo provides *real* PATH_INFO/PATH_TRANSLATED support for CGI. PHP's
757757
; previous behaviour was to set PATH_TRANSLATED to SCRIPT_FILENAME, and to not grok
@@ -768,7 +768,7 @@ enable_dl = Off
768768
; does not currently support this feature (03/17/2002)
769769
; Set to 1 if running under IIS. Default is zero.
770770
; http://php.net/fastcgi.impersonate
771-
;fastcgi.impersonate = 1;
771+
;fastcgi.impersonate = 1
772772

773773
; Disable logging through FastCGI connection. PHP's default behavior is to enable
774774
; this feature.

php.ini-production

+2-2
Original file line numberDiff line numberDiff line change
@@ -751,7 +751,7 @@ enable_dl = Off
751751
; will look for to know it is OK to continue execution. Setting this variable MAY
752752
; cause security issues, KNOW WHAT YOU ARE DOING FIRST.
753753
; http://php.net/cgi.redirect-status-env
754-
;cgi.redirect_status_env = ;
754+
;cgi.redirect_status_env =
755755

756756
; cgi.fix_pathinfo provides *real* PATH_INFO/PATH_TRANSLATED support for CGI. PHP's
757757
; previous behaviour was to set PATH_TRANSLATED to SCRIPT_FILENAME, and to not grok
@@ -768,7 +768,7 @@ enable_dl = Off
768768
; does not currently support this feature (03/17/2002)
769769
; Set to 1 if running under IIS. Default is zero.
770770
; http://php.net/fastcgi.impersonate
771-
;fastcgi.impersonate = 1;
771+
;fastcgi.impersonate = 1
772772

773773
; Disable logging through FastCGI connection. PHP's default behavior is to enable
774774
; this feature.

0 commit comments

Comments
 (0)