Merge: make max_file_uploads PHP_INI_SYSTEM|PHP_INI_PERDIR

diff --git a/NEWS b/NEWS
index b038437120d5cd20b703f926f00a680886b356d3..467acb7d14aacfbdd35b80c22d2bfad180ebf978 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -4,6 +4,7 @@ PHP                                                                        NEWS
 
 - Standard:
   . Fixed memory leak in substr_replace. (Pierrick)
+  . make max_file_uploads ini directive settable outside of php.ini (Rasmus)
 
 01 Mar 2012, PHP 5.4.0 
 

diff --git a/main/main.c b/main/main.c
index ac78976e899ce1ea2f4d0d02f9684b058f1afd13..6a04ddbaf100ce8e4a56b3927f74cf0d87c05ffe 100644 (file)
--- a/main/main.c
+++ b/main/main.c
@@ -552,7 +552,7 @@ PHP_INI_BEGIN()
        PHP_INI_ENTRY("mail.force_extra_parameters",NULL,               PHP_INI_SYSTEM|PHP_INI_PERDIR,          OnChangeMailForceExtra)
        PHP_INI_ENTRY("disable_functions",                      "",                     PHP_INI_SYSTEM,         NULL)
        PHP_INI_ENTRY("disable_classes",                        "",                     PHP_INI_SYSTEM,         NULL)
-       PHP_INI_ENTRY("max_file_uploads",                       "20",                   PHP_INI_SYSTEM,         NULL)
+       PHP_INI_ENTRY("max_file_uploads",                       "20",           PHP_INI_SYSTEM|PHP_INI_PERDIR,          NULL)
 
        STD_PHP_INI_BOOLEAN("allow_url_fopen",          "1",            PHP_INI_SYSTEM,         OnUpdateBool,           allow_url_fopen,                php_core_globals,               core_globals)
        STD_PHP_INI_BOOLEAN("allow_url_include",        "0",            PHP_INI_SYSTEM,         OnUpdateBool,           allow_url_include,              php_core_globals,               core_globals)