cvs: /php4 configuration-parser.y main.c

zeev Sat Feb 26 14:15:19 2000 EDT Modified files: /php4 configuration-parser.y main.c Log: Verified $HTTP_*[] protection Index: php4/configuration-parser.y diff -u php4/configuration-parser.y:1.36 php4/configuration-parser.y:1.37 --- php4/configuration-parser.y:1.36 Sat Feb 26 07:36:23 2000 +++ php4/configuration-parser.y Sat Feb 26 14:14:49 2000 @@ -19,7 +19,7 @@ -/* $Id: configuration-parser.y,v 1.36 2000/02/26 15:36:23 zeev Exp $ */ +/* $Id: configuration-parser.y,v 1.37 2000/02/26 22:14:49 zeev Exp $ */ #define DEBUG_CFG_PARSER 0 #include "php.h" @@ -44,10 +44,8 @@ #define PARSING_MODE_BROWSCAP 1 static HashTable configuration_hash; -#ifndef THREAD_SAFE extern HashTable browser_hash; PHPAPI extern char *php_ini_path; -#endif static HashTable *active_hash_table; static zval *current_section; static char *currently_parsed_filename; @@ -428,7 +426,7 @@ free($1.value.str.val); } | TC_STRING { free($1.value.str.val); } - | EXTENSION '=' string_foo { + | EXTENSION '=' cfg_string { zval dummy; #if DEBUG_CFG_PARSER printf("Loading '%s'\n",$3.value.str.val); @@ -436,25 +434,25 @@ php_dl(&$3,MODULE_PERSISTENT,&dummy); } - | T_ZEND_EXTENSION '=' string_foo { + | T_ZEND_EXTENSION '=' cfg_string { #if !defined(ZTS) && !ZEND_DEBUG zend_load_extension($3.value.str.val); #endif free($3.value.str.val); } - | T_ZEND_EXTENSION_TS '=' string_foo { + | T_ZEND_EXTENSION_TS '=' cfg_string { #if defined(ZTS) && !ZEND_DEBUG zend_load_extension($3.value.str.val); #endif free($3.value.str.val); } - | T_ZEND_EXTENSION_DEBUG '=' string_foo { + | T_ZEND_EXTENSION_DEBUG '=' cfg_string { #if !defined(ZTS) && ZEND_DEBUG zend_load_extension($3.value.str.val); #endif free($3.value.str.val); } - | T_ZEND_EXTENSION_DEBUG_TS '=' string_foo { + | T_ZEND_EXTENSION_DEBUG_TS '=' cfg_string { #if defined(ZTS) && ZEND_DEBUG zend_load_extension($3.value.str.val); #endif @@ -488,7 +486,7 @@ ; -string_foo: +cfg_string: TC_STRING { $$ = $1; } | TC_ENCAPSULATED_STRING { $$ = $1; } ; Index: php4/main.c diff -u php4/main.c:1.222 php4/main.c:1.223 --- php4/main.c:1.222 Sat Feb 26 13:20:38 2000 +++ php4/main.c Sat Feb 26 14:14:49 2000 @@ -19,7 +19,7 @@ */ -/* $Id: main.c,v 1.222 2000/02/26 21:20:38 andrei Exp $ */ +/* $Id: main.c,v 1.223 2000/02/26 22:14:49 zeev Exp $ */ #include <stdio.h> @@ -1001,22 +1001,22 @@ } if (PG(http_globals).post) { - zend_hash_add_ptr(&EG(symbol_table), "HTTP_POST_VARS", sizeof("HTTP_POST_VARS"), PG(http_globals).post, sizeof(zval *), NULL); + zend_hash_update_ptr(&EG(symbol_table), "HTTP_POST_VARS", sizeof("HTTP_POST_VARS"), PG(http_globals).post, sizeof(zval *), NULL); } if (PG(http_globals).get) { - zend_hash_add_ptr(&EG(symbol_table), "HTTP_GET_VARS", sizeof("HTTP_GET_VARS"), PG(http_globals).get, sizeof(zval *), NULL); + zend_hash_update_ptr(&EG(symbol_table), "HTTP_GET_VARS", sizeof("HTTP_GET_VARS"), PG(http_globals).get, sizeof(zval *), NULL); } if (PG(http_globals).cookie) { - zend_hash_add_ptr(&EG(symbol_table), "HTTP_COOKIE_VARS", sizeof("HTTP_COOKIE_VARS"), PG(http_globals).cookie, sizeof(zval *), NULL); + zend_hash_update_ptr(&EG(symbol_table), "HTTP_COOKIE_VARS", sizeof("HTTP_COOKIE_VARS"), PG(http_globals).cookie, sizeof(zval *), NULL); } if (PG(http_globals).server) { - zend_hash_add_ptr(&EG(symbol_table), "HTTP_SERVER_VARS", sizeof("HTTP_SERVER_VARS"), PG(http_globals).server, sizeof(zval *), NULL); + zend_hash_update_ptr(&EG(symbol_table), "HTTP_SERVER_VARS", sizeof("HTTP_SERVER_VARS"), PG(http_globals).server, sizeof(zval *), NULL); } if (PG(http_globals).environment) { - zend_hash_add_ptr(&EG(symbol_table), "HTTP_ENV_VARS", sizeof("HTTP_ENV_VARS"), PG(http_globals).environment, sizeof(zval *), NULL); + zend_hash_update_ptr(&EG(symbol_table), "HTTP_ENV_VARS", sizeof("HTTP_ENV_VARS"), PG(http_globals).environment, sizeof(zval *), NULL); } if (PG(http_globals).post_files) { - zend_hash_add_ptr(&EG(symbol_table), "HTTP_POST_FILES", sizeof("HTTP_POST_FILES"), PG(http_globals).post_files, sizeof(zval *),NULL); + zend_hash_update_ptr(&EG(symbol_table), "HTTP_POST_FILES", sizeof("HTTP_POST_FILES"), PG(http_globals).post_files, sizeof(zval *),NULL); } return SUCCESS;