sander          Fri Sep 20 14:07:49 2002 EDT

  Modified files:              
    /php4/main  main.c 
  Log:
  Changing the magic_quotes_gpc setting has no effect at USER level
  # this partially fixes the #19526 shit
  
  
Index: php4/main/main.c
diff -u php4/main/main.c:1.488 php4/main/main.c:1.489
--- php4/main/main.c:1.488      Thu Sep 19 11:54:23 2002
+++ php4/main/main.c    Fri Sep 20 14:07:48 2002
@@ -18,7 +18,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: main.c,v 1.488 2002/09/19 15:54:23 zeev Exp $ */
+/* $Id: main.c,v 1.489 2002/09/20 18:07:48 sander Exp $ */
 
 /* {{{ includes
  */
@@ -258,7 +258,7 @@
        STD_PHP_INI_BOOLEAN("ignore_repeated_errors",   "0",    PHP_INI_ALL,           
 OnUpdateBool,                   ignore_repeated_errors, php_core_globals,       
core_globals)
        STD_PHP_INI_BOOLEAN("ignore_repeated_source",   "0",    PHP_INI_ALL,           
 OnUpdateBool,                   ignore_repeated_source, php_core_globals,       
core_globals)
        STD_PHP_INI_BOOLEAN("report_memleaks",          "1",            
PHP_INI_SYSTEM,         OnUpdateBool,                   report_memleaks,               
 php_core_globals,       core_globals)
-       STD_PHP_INI_BOOLEAN("magic_quotes_gpc",         "1",            PHP_INI_ALL,   
         OnUpdateBool,                   magic_quotes_gpc,               
php_core_globals,       core_globals)
+       STD_PHP_INI_BOOLEAN("magic_quotes_gpc",         "1",            
+PHP_INI_PERDIR|PHP_INI_SYSTEM,OnUpdateBool,     magic_quotes_gpc,               
+php_core_globals,       core_globals)
        STD_PHP_INI_BOOLEAN("magic_quotes_runtime",     "0",            PHP_INI_ALL,   
         OnUpdateBool,                   magic_quotes_runtime,   php_core_globals,     
  core_globals)
        STD_PHP_INI_BOOLEAN("magic_quotes_sybase",      "0",            PHP_INI_ALL,   
         OnUpdateBool,                   magic_quotes_sybase,    php_core_globals,     
  core_globals)
        STD_PHP_INI_ENTRY("output_buffering",   "0",    
PHP_INI_PERDIR|PHP_INI_SYSTEM,OnUpdateInt,      output_buffering,       
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