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

[Zeev Suraski]

zeev            Sat Jan 13 05:10:50 2001 EDT

  Modified files:              
    /php4/main  main.c php_ini.c 
  Log:
  Remove stale code
  
  
Index: php4/main/main.c
diff -u php4/main/main.c:1.346 php4/main/main.c:1.347
--- php4/main/main.c:1.346      Sun Jan  7 10:38:38 2001
+++ php4/main/main.c    Sat Jan 13 05:10:50 2001
@@ -19,7 +19,7 @@
 */
 
 
-/* $Id: main.c,v 1.346 2001/01/07 18:38:38 zeev Exp $ */
+/* $Id: main.c,v 1.347 2001/01/13 13:10:50 zeev Exp $ */
 
 
 #include <stdio.h>
@@ -102,10 +102,6 @@
 static void php_build_argv(char *s, zval *track_vars_array ELS_DC PLS_DC);
 
 void *gLock;                                   /*mutex variable */
-
-
-/* True globals (no need for thread safety) */
-HashTable configuration_hash;
 
 #define SAFE_FILENAME(f) ((f)?(f):"-")
 
Index: php4/main/php_ini.c
diff -u php4/main/php_ini.c:1.46 php4/main/php_ini.c:1.47
--- php4/main/php_ini.c:1.46    Tue Jan  2 14:49:26 2001
+++ php4/main/php_ini.c Sat Jan 13 05:10:50 2001
@@ -136,8 +136,7 @@
                                } else {
                                        zend_hash_update(&configuration_hash, 
Z_STRVAL_P(arg1), Z_STRLEN_P(arg1)+1, arg2, sizeof(zval), (void **) &entry);
                                        Z_STRVAL_P(entry) = 
zend_strndup(Z_STRVAL_P(entry), Z_STRLEN_P(entry));
-                                       php_alter_ini_entry(Z_STRVAL_P(arg1), 
Z_STRLEN_P(arg1)+1, Z_STRVAL_P(arg2), Z_STRLEN_P(arg2)+1, PHP_INI_SYSTEM, 
PHP_INI_STAGE_STARTUP);
-                               }
+                                       }
                        }
                        break;
                case ZEND_INI_PARSER_SECTION:



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
To contact the list administrators, e-mail: [EMAIL PROTECTED]