svn: /php/php-src/trunk/main/ main.c

rasmus Fri, 17 Feb 2012 17:54:11 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=323296 Log: I think we should let this be settable from .htaccess to match the other post/upload related limits like upload_max_filesize, post_max_size, and max_input_vars. Changed paths: U php/php-src/trunk/main/main.c Modified: php/php-src/trunk/main/main.c =================================================================== --- php/php-src/trunk/main/main.c 2012-02-17 17:45:36 UTC (rev 323295) +++ php/php-src/trunk/main/main.c 2012-02-17 17:54:11 UTC (rev 323296) @@ -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)