Allow setting post_max_size and upload_max_filesize in .htaccess files too

diff --git a/main/main.c b/main/main.c
index 38ba3eb79eca35158640f6ef85f12262eb88995d..a46e30e222fb7ac64082d2ad72cfe0f034eb6811 100644 (file)
--- a/main/main.c
+++ b/main/main.c
@@ -279,10 +279,12 @@ PHP_INI_BEGIN()
        PHP_INI_ENTRY("max_execution_time",                     "30",           PHP_INI_ALL,                    OnUpdateTimeout)
        STD_PHP_INI_ENTRY("open_basedir",                       NULL,           PHP_INI_SYSTEM,         OnUpdateStringUnempty,  open_basedir,                   php_core_globals,       core_globals)
        STD_PHP_INI_ENTRY("safe_mode_exec_dir",         "1",            PHP_INI_SYSTEM,         OnUpdateString,                 safe_mode_exec_dir,             php_core_globals,       core_globals)
-       STD_PHP_INI_ENTRY("upload_max_filesize",        "2M",           PHP_INI_SYSTEM,         OnUpdateInt,                    upload_max_filesize,    php_core_globals,       core_globals)
-       STD_PHP_INI_BOOLEAN("file_uploads",                     "1",            PHP_INI_ALL,            OnUpdateBool,                   file_uploads,                   php_core_globals,       core_globals)
-       STD_PHP_INI_ENTRY("post_max_size",                      "8M",           PHP_INI_SYSTEM,         OnUpdateInt,                    post_max_size,                  sapi_globals_struct,sapi_globals)
+
+       STD_PHP_INI_BOOLEAN("file_uploads",                     "1",            PHP_INI_SYSTEM,         OnUpdateBool,                   file_uploads,                   php_core_globals,       core_globals)
+       STD_PHP_INI_ENTRY("upload_max_filesize",        "2M",           PHP_INI_SYSTEM|PHP_INI_PERDIR,          OnUpdateInt,                    upload_max_filesize,    php_core_globals,       core_globals)
+       STD_PHP_INI_ENTRY("post_max_size",                      "8M",           PHP_INI_SYSTEM|PHP_INI_PERDIR,          OnUpdateInt,                    post_max_size,                  sapi_globals_struct,sapi_globals)
        STD_PHP_INI_ENTRY("upload_tmp_dir",                     NULL,           PHP_INI_SYSTEM,         OnUpdateStringUnempty,  upload_tmp_dir,                 php_core_globals,       core_globals)
+
        STD_PHP_INI_ENTRY("user_dir",                           NULL,           PHP_INI_SYSTEM,         OnUpdateStringUnempty,  user_dir,                               php_core_globals,       core_globals)
        STD_PHP_INI_ENTRY("variables_order",            NULL,           PHP_INI_ALL,            OnUpdateStringUnempty,  variables_order,                php_core_globals,       core_globals)