[PHP-CVS] cvs: php4 /main main.c

[Jani Taskinen]

sniper          Sat Feb 15 15:22:20 2003 EDT

  Modified files:              
    /php4/main  main.c 
  Log:
  - Fix unsetting of open_basedir, safe_mode_exec_dir and user_dir with
    "php_admin_value <ini option> none"
  - Fixes bug #22220  
  
  
Index: php4/main/main.c
diff -u php4/main/main.c:1.524 php4/main/main.c:1.525
--- php4/main/main.c:1.524      Tue Jan 28 19:47:31 2003
+++ php4/main/main.c    Sat Feb 15 15:22:19 2003
@@ -18,7 +18,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: main.c,v 1.524 2003/01/29 00:47:31 phanto Exp $ */
+/* $Id: main.c,v 1.525 2003/02/15 20:22:19 sniper Exp $ */
 
 /* {{{ includes
  */
@@ -301,15 +301,15 @@
        STD_PHP_INI_ENTRY("gpc_order",                          "GPC",          
PHP_INI_ALL,            OnUpdateStringUnempty,  gpc_order,                             
 php_core_globals,       core_globals)
        STD_PHP_INI_ENTRY("include_path",                       PHP_INCLUDE_PATH,      
         PHP_INI_ALL,            OnUpdateStringUnempty,  include_path,                 
  php_core_globals,       core_globals)
        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("open_basedir",                       NULL,           
+PHP_INI_SYSTEM,         OnUpdateString,                 open_basedir,                 
+  php_core_globals,       core_globals)
+       STD_PHP_INI_ENTRY("safe_mode_exec_dir",         "",                     
+PHP_INI_SYSTEM,         OnUpdateString,                 safe_mode_exec_dir,           
+  php_core_globals,       core_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("user_dir",                           NULL,           
+PHP_INI_SYSTEM,         OnUpdateString,                 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)
 
        STD_PHP_INI_ENTRY("error_append_string",        NULL,           PHP_INI_ALL,   
         OnUpdateString,                 error_append_string,    php_core_globals,     
  core_globals)



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