From: Nikita Popov <nikita.ppv@gmail.com>
Date: Tue, 29 Sep 2020 08:48:12 +0000 (+0200)
Subject: Merge branch 'PHP-7.4'
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=45b0716733cf094db2c5ce12a3de9fc4ac835250;p=php

Merge branch 'PHP-7.4'

* PHP-7.4:
  Synchronize php.ini-development and php.ini-production
---

45b0716733cf094db2c5ce12a3de9fc4ac835250
diff --cc php.ini-development
index 54006830a2,ea687bea15..65532be9e2
--- a/php.ini-development
+++ b/php.ini-development
@@@ -371,19 -361,12 +371,21 @@@ zend.enable_gc = O
  ;zend.script_encoding =
  
  ; Allows to include or exclude arguments from stack traces generated for exceptions.
 -; In production, it is recommended to turn this setting on to prohibit the output 
++; In production, it is recommended to turn this setting on to prohibit the output
+ ; of sensitive information in stack traces
 -; Default: Off
 +; Default Value: Off
 +; Development Value: Off
 +; Production Value: On
  zend.exception_ignore_args = Off
  
 +; Allows setting the maximum string length in an argument of a stringified stack trace
 +; to a value between 0 and 1000000.
 +; This has no effect when zend.exception_ignore_args is enabled.
 +; Default Value: 15
 +; Development Value: 15
 +; Production Value: 0
 +zend.exception_string_param_max_len = 15
 +
  ;;;;;;;;;;;;;;;;;
  ; Miscellaneous ;
  ;;;;;;;;;;;;;;;;;
diff --cc php.ini-production
index 47a5c5e13b,8d54423003..472a87eab0
--- a/php.ini-production
+++ b/php.ini-production
@@@ -368,26 -358,15 +368,26 @@@ zend.enable_gc = O
  ; 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
+ ; Allows to include or exclude arguments from stack traces generated for exceptions.
 -; In production, it is recommended to turn this setting on to prohibit the output 
 +; In production, it is recommended to turn this setting on to prohibit the output
  ; of sensitive information in stack traces
 -; Default: Off
 +; Default Value: Off
 +; Development Value: Off
 +; Production Value: On
  zend.exception_ignore_args = On
  
 +; Allows setting the maximum string length in an argument of a stringified stack trace
 +; to a value between 0 and 1000000.
 +; This has no effect when zend.exception_ignore_args is enabled.
 +; Default Value: 15
 +; Development Value: 15
 +; Production Value: 0
 +; In production, it is recommended to set this to 0 to reduce the output
 +; of sensitive information in stack traces.
 +zend.exception_string_param_max_len = 0
 +
  ;;;;;;;;;;;;;;;;;
  ; Miscellaneous ;
  ;;;;;;;;;;;;;;;;;