Skip to content

Commit

Permalink
php.ini cleanup
Browse files Browse the repository at this point in the history
[ci skip]
  • Loading branch information
nikic committed Jul 22, 2020
1 parent c9434a4 commit 9250abf
Show file tree
Hide file tree
Showing 2 changed files with 23 additions and 17 deletions.
21 changes: 12 additions & 9 deletions php.ini-development
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,7 @@
;;;;;;;;;;;;;;;;;;;
; Quick Reference ;
;;;;;;;;;;;;;;;;;;;

; The following are all the settings which are different in either the production
; or development versions of the INIs with respect to PHP's default behavior.
; Please see the actual settings later in the document for more details as to why
Expand Down Expand Up @@ -153,6 +154,11 @@
; Development Value: "GPCS"
; Production Value: "GPCS"

; zend.exception_ignore_args
; Default Value: Off
; Development Value: Off
; Production Value: On

;;;;;;;;;;;;;;;;;;;;
; php.ini Options ;
;;;;;;;;;;;;;;;;;;;;
Expand Down Expand Up @@ -352,17 +358,17 @@ zend.enable_gc = On
; If enabled, scripts may be written in encodings that are incompatible with
; the scanner. CP936, Big5, CP949 and Shift_JIS are the examples of such
; encodings. To use this feature, mbstring extension must be enabled.
; Default: Off
;zend.multibyte = Off

; Allows to set the default encoding for the scripts. This value will be used
; unless "declare(encoding=...)" directive appears at the top of the script.
; Only affects if zend.multibyte is set.
; Default: ""
;zend.script_encoding =

; Allows to include or exclude arguments from stack traces generated for exceptions
; Default: Off
; Allows to include or exclude arguments from stack traces generated for exceptions.
; Default Value: Off
; Development Value: Off
; Production Value: On
zend.exception_ignore_args = Off

;;;;;;;;;;;;;;;;;
Expand Down Expand Up @@ -1644,9 +1650,8 @@ zend.assertions = 1
; http://php.net/mbstring.substitute-character
;mbstring.substitute_character = none

; enable strict encoding detection.
; Default: Off
;mbstring.strict_detection = On
; Enable strict encoding detection.
;mbstring.strict_detection = Off

; This directive specifies the regex pattern of content types for which mb_output_handler()
; is activated.
Expand All @@ -1655,12 +1660,10 @@ zend.assertions = 1

; This directive specifies maximum stack depth for mbstring regular expressions. It is similar
; to the pcre.recursion_limit for PCRE.
; Default: 100000
;mbstring.regex_stack_limit=100000

; This directive specifies maximum retry count for mbstring regular expressions. It is similar
; to the pcre.backtrack_limit for PCRE.
; Default: 1000000
;mbstring.regex_retry_limit=1000000

[gd]
Expand Down
19 changes: 11 additions & 8 deletions php.ini-production
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,7 @@
;;;;;;;;;;;;;;;;;;;
; Quick Reference ;
;;;;;;;;;;;;;;;;;;;

; The following are all the settings which are different in either the production
; or development versions of the INIs with respect to PHP's default behavior.
; Please see the actual settings later in the document for more details as to why
Expand Down Expand Up @@ -153,6 +154,11 @@
; Development Value: "GPCS"
; Production Value: "GPCS"

; zend.exception_ignore_args
; Default Value: Off
; Development Value: Off
; Production Value: On

;;;;;;;;;;;;;;;;;;;;
; php.ini Options ;
;;;;;;;;;;;;;;;;;;;;
Expand Down Expand Up @@ -352,19 +358,19 @@ zend.enable_gc = On
; If enabled, scripts may be written in encodings that are incompatible with
; the scanner. CP936, Big5, CP949 and Shift_JIS are the examples of such
; encodings. To use this feature, mbstring extension must be enabled.
; Default: Off
;zend.multibyte = Off

; Allows to set the default encoding for the scripts. This value will be used
; unless "declare(encoding=...)" directive appears at the top of the script.
; Only affects if zend.multibyte is set.
; Default: ""
;zend.script_encoding =

; Allows to include or exclude arguments from stack traces generated for exceptions
; Default: Off
; In production, it is recommended to turn this setting on to prohibit the output
; of sensitive information in stack traces
; Default Value: Off
; Development Value: Off
; Production Value: On
zend.exception_ignore_args = On

;;;;;;;;;;;;;;;;;
Expand Down Expand Up @@ -1646,9 +1652,8 @@ zend.assertions = -1
; http://php.net/mbstring.substitute-character
;mbstring.substitute_character = none

; enable strict encoding detection.
; Default: Off
;mbstring.strict_detection = On
; Enable strict encoding detection.
;mbstring.strict_detection = Off

; This directive specifies the regex pattern of content types for which mb_output_handler()
; is activated.
Expand All @@ -1657,12 +1662,10 @@ zend.assertions = -1

; This directive specifies maximum stack depth for mbstring regular expressions. It is similar
; to the pcre.recursion_limit for PCRE.
; Default: 100000
;mbstring.regex_stack_limit=100000

; This directive specifies maximum retry count for mbstring regular expressions. It is similar
; to the pcre.backtrack_limit for PCRE.
; Default: 1000000
;mbstring.regex_retry_limit=1000000

[gd]
Expand Down

0 comments on commit 9250abf

Please sign in to comment.