From: Rasmus Lerdorf Date: Thu, 1 Mar 2012 22:49:03 +0000 (+0000) Subject: Merge: make max_file_uploads PHP_INI_SYSTEM|PHP_INI_PERDIR X-Git-Tag: PHP-5.4.1-RC1~122 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=02f6937073a2ce6436cc0223af502676427eb256;p=php Merge: make max_file_uploads PHP_INI_SYSTEM|PHP_INI_PERDIR --- diff --git a/NEWS b/NEWS index b038437120..467acb7d14 100644 --- 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 ac78976e89..6a04ddbaf1 100644 --- 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)