[PHP4BETA] CVS update: php4

Date: Wednesday April 21, 1999 @ 13:28 Author: zeev Update of /repository/php4 In directory php:/tmp/cvs-serv20359 Modified Files: configuration-parser.y main.c php4ts.dsw php_ini.c testfunc Log Message: Thread safety patch. It works now with just-in-time resource initialization! Index: php4/configuration-parser.y diff -c php4/configuration-parser.y:1.6 php4/configuration-parser.y:1.7 *** php4/configuration-parser.y:1.6 Wed Apr 21 00:02:10 1999 --- php4/configuration-parser.y Wed Apr 21 13:28:54 1999 *************** *** 30,36 **** ! /* $Id: configuration-parser.y,v 1.6 1999/04/21 04:02:10 zeev Exp $ */ #define DEBUG_CFG_PARSER 1 #include "php.h" --- 30,36 ---- ! /* $Id: configuration-parser.y,v 1.7 1999/04/21 17:28:54 zeev Exp $ */ #define DEBUG_CFG_PARSER 1 #include "php.h" *************** *** 167,172 **** --- 167,173 ---- { char *env_location,*default_location,*php_ini_path; int safe_mode_state = PG(safe_mode); + char *open_basedir = PG(open_basedir); char *opened_path; int free_default_location=0; *************** *** 209,220 **** --- 210,223 ---- strcpy(php_ini_path,default_location); } PG(safe_mode) = 0; + PG(open_basedir) = NULL; cfgin = php3_fopen_with_path("php3.ini","r",php_ini_path,&opened_path); free(php_ini_path); if (free_default_location) { free(default_location); } PG(safe_mode) = safe_mode_state; + PG(open_basedir) = open_basedir; if (!cfgin) { # if WIN32|WINNT Index: php4/main.c diff -c php4/main.c:1.20 php4/main.c:1.21 *** php4/main.c:1.20 Wed Apr 21 00:02:11 1999 --- php4/main.c Wed Apr 21 13:28:54 1999 *************** *** 29,35 **** +----------------------------------------------------------------------+ */ ! /* $Id: main.c,v 1.20 1999/04/21 04:02:11 zeev Exp $ */ /* #define CRASH_DETECTION */ --- 29,35 ---- +----------------------------------------------------------------------+ */ ! /* $Id: main.c,v 1.21 1999/04/21 17:28:54 zeev Exp $ */ /* #define CRASH_DETECTION */ *************** *** 1199,1205 **** if (setjmp(EG(bailout))!=0) { return; } ! _php3_hash_environment(); #if WIN32||WINNT UpdateIniFromRegistry(primary_file->filename); --- 1199,1205 ---- if (setjmp(EG(bailout))!=0) { return; } ! _php3_hash_environment(PLS_C); #if WIN32||WINNT UpdateIniFromRegistry(primary_file->filename); Index: php4/php4ts.dsw diff -c php4/php4ts.dsw:1.1 php4/php4ts.dsw:1.2 *** php4/php4ts.dsw:1.1 Wed Apr 21 11:34:31 1999 --- php4/php4ts.dsw Wed Apr 21 13:28:54 1999 *************** *** 23,31 **** Package=<4> {{{ - Begin Project Dependency - Project_Dep_Name TSRM - End Project Dependency }}} ############################################################################### --- 23,28 ---- *************** *** 40,45 **** --- 37,45 ---- {{{ Begin Project Dependency Project_Dep_Name libzendts + End Project Dependency + Begin Project Dependency + Project_Dep_Name TSRM End Project Dependency }}} Index: php4/php_ini.c diff -c php4/php_ini.c:1.11 php4/php_ini.c:1.12 *** php4/php_ini.c:1.11 Mon Apr 12 15:40:33 1999 --- php4/php_ini.c Wed Apr 21 13:28:54 1999 *************** *** 105,110 **** --- 105,113 ---- php_unregister_ini_entries(module_number); return FAILURE; } + if (hashed_ini_entry->on_modify) { + hashed_ini_entry->on_modify(hashed_ini_entry, hashed_ini_entry->value, hashed_ini_entry->value_length, hashed_ini_entry->mh_arg); + } if ((default_value=cfg_get_entry(p->name, p->name_length))) { if (!hashed_ini_entry->on_modify || hashed_ini_entry->on_modify(hashed_ini_entry, default_value->value.str.val, default_value->value.str.len, hashed_ini_entry->mh_arg)==SUCCESS) { Index: php4/testfunc diff -c php4/testfunc:1.1.1.1 php4/testfunc:1.2 *** php4/testfunc:1.1.1.1 Wed Apr 7 17:02:47 1999 --- php4/testfunc Wed Apr 21 13:28:54 1999 *************** *** 16,22 **** foo(); } ! for ($i=0; $i<100000; $i++) { bar(); } --- 16,22 ---- foo(); } ! for ($i=0; $i<1000; $i++) { bar(); } -- PHP 4 Beta