rasmus                                   Thu, 01 Mar 2012 22:49:03 +0000

Revision: http://svn.php.net/viewvc?view=revision&revision=323739

Log:
Merge: make max_file_uploads PHP_INI_SYSTEM|PHP_INI_PERDIR

Changed paths:
    U   php/php-src/branches/PHP_5_4/NEWS
    U   php/php-src/branches/PHP_5_4/main/main.c

Modified: php/php-src/branches/PHP_5_4/NEWS
===================================================================
--- php/php-src/branches/PHP_5_4/NEWS   2012-03-01 22:48:49 UTC (rev 323738)
+++ php/php-src/branches/PHP_5_4/NEWS   2012-03-01 22:49:03 UTC (rev 323739)
@@ -4,6 +4,7 @@

 - 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


Modified: php/php-src/branches/PHP_5_4/main/main.c
===================================================================
--- php/php-src/branches/PHP_5_4/main/main.c    2012-03-01 22:48:49 UTC (rev 
323738)
+++ php/php-src/branches/PHP_5_4/main/main.c    2012-03-01 22:49:03 UTC (rev 
323739)
@@ -552,7 +552,7 @@
        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)

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to