CVS update: php31/main

Date: Thursday September 3, 1998 @ 14:41 Author: shane Update of /repository/php31/main In directory asf:/u2/tmp/cvs-serv25682/main Modified Files: alloc.c automated_configuration.h automated_configuration_definitions.h main.c Log Message: Per server/directory reading much optimized. Index: php31/main/alloc.c diff -c php31/main/alloc.c:2.3 php31/main/alloc.c:2.4 *** php31/main/alloc.c:2.3 Thu Aug 20 20:30:44 1998 --- php31/main/alloc.c Thu Sep 3 14:41:54 1998 *************** *** 361,367 **** /* does not use php3_error() *intentionally* */ if (GLOBAL(error_reporting) & E_WARNING && GLOBAL(shutdown_requested)!=ABNORMAL_SHUTDOWN) { # if CRASH_DETECTION /* log into the errorlog, since at this time we can't send messages to the browser */ ! debug_log("Possible PHP3 memory leak detected (harmless): %d bytes from %s:%d",t->size,t->filename,t->lineno); # endif } #endif --- 361,367 ---- /* does not use php3_error() *intentionally* */ if (GLOBAL(error_reporting) & E_WARNING && GLOBAL(shutdown_requested)!=ABNORMAL_SHUTDOWN) { # if CRASH_DETECTION /* log into the errorlog, since at this time we can't send messages to the browser */ ! debug_log("Possible PHP3 memory leak detected (harmless): %d bytes from %s:%d\n",t->size,t->filename,t->lineno); # endif } #endif Index: php31/main/automated_configuration.h diff -c php31/main/automated_configuration.h:2.5 php31/main/automated_configuration.h:2.6 *** php31/main/automated_configuration.h:2.5 Thu Sep 3 03:11:18 1998 --- php31/main/automated_configuration.h Thu Sep 3 14:41:55 1998 *************** *** 3,9 **** BEGIN_INI_TABLE() INI_ENTRY(engine, AC_BOOL, 1, AC_NO, "Turn the PHP engine on/off") INI_ENTRY(use_registry, AC_BOOL, 0, AC_NO, "Use Win32 Registry for per-server vars") ! INI_ENTRY(use_registry_dir, AC_BOOL, 0, AC_NO, "Use Win32 Registry for per-directory vars") INI_ENTRY(short_open_tag, AC_BOOL, 1, AC_YES, "Allow <? as an open tag") INI_ENTRY(precision, AC_LONG, 14, AC_YES, "Precision of floating point numbers") INI_ENTRY(y2k_compliance, AC_BOOL, 0, AC_YES, "Year 2000 compliance") --- 3,9 ---- BEGIN_INI_TABLE() INI_ENTRY(engine, AC_BOOL, 1, AC_NO, "Turn the PHP engine on/off") INI_ENTRY(use_registry, AC_BOOL, 0, AC_NO, "Use Win32 Registry for per-server vars") ! INI_ENTRY(use_registry_dir, AC_BOOL, 0, AC_NO_SAFEMODE, "Use Win32 Registry for per-directory vars") INI_ENTRY(short_open_tag, AC_BOOL, 1, AC_YES, "Allow <? as an open tag") INI_ENTRY(precision, AC_LONG, 14, AC_YES, "Precision of floating point numbers") INI_ENTRY(y2k_compliance, AC_BOOL, 0, AC_YES, "Year 2000 compliance") Index: php31/main/automated_configuration_definitions.h diff -c php31/main/automated_configuration_definitions.h:2.3 php31/main/automated_configuration_definitions.h:2.4 *** php31/main/automated_configuration_definitions.h:2.3 Thu Sep 3 03:11:18 1998 --- php31/main/automated_configuration_definitions.h Thu Sep 3 14:41:55 1998 *************** *** 261,267 **** # define AC_BOOL AC_LONG # define AC_YES 1 # define AC_NO 0 ! # define AC_NO_SAFEMODE AC_NO # define INI_ENTRY(name, type, default_value, user_modifyable, description) \ { #name, (void *)&GLOBAL(php3_ini)->name, type, user_modifyable, NULL }, # define GROUP_INI_ENTRY(group_name, name, type, default_value, user_modifyable, description) \ --- 261,267 ---- # define AC_BOOL AC_LONG # define AC_YES 1 # define AC_NO 0 ! # define AC_NO_SAFEMODE 2 # define INI_ENTRY(name, type, default_value, user_modifyable, description) \ { #name, (void *)&GLOBAL(php3_ini)->name, type, user_modifyable, NULL }, # define GROUP_INI_ENTRY(group_name, name, type, default_value, user_modifyable, description) \ *************** *** 313,319 **** # define INI_ENTRY(name, type, default_value, user_modifyable, description) \ ! if(!cfg_get_ini_var(type, #name, (void *)&php3_ini_master.name)){php3_ini_master.name=default_value;} # define GROUP_INI_ENTRY(group_name, name, type, default_value, user_modifyable, description) \ if(!cfg_get_ini_var(type, #group_name "." #name, (void *)&php3_ini_master.group_name##_##name)){php3_ini_master.group_name##_##name=default_value;} --- 313,319 ---- # define INI_ENTRY(name, type, default_value, user_modifyable, description) \ ! if(!cfg_get_ini_var(type, #name, (void *)&php3_ini_master.name)){php3_ini_master.name=default_value;} # define GROUP_INI_ENTRY(group_name, name, type, default_value, user_modifyable, description) \ if(!cfg_get_ini_var(type, #group_name "." #name, (void *)&php3_ini_master.group_name##_##name)){php3_ini_master.group_name##_##name=default_value;} Index: php31/main/main.c diff -c php31/main/main.c:2.32 php31/main/main.c:2.33 *** php31/main/main.c:2.32 Thu Sep 3 03:11:19 1998 --- php31/main/main.c Thu Sep 3 14:41:55 1998 *************** *** 29,35 **** +----------------------------------------------------------------------+ */ ! /* $Id: main.c,v 2.32 1998/09/03 07:11:19 shane Exp $ */ /* #define CRASH_DETECTION */ --- 29,35 ---- +----------------------------------------------------------------------+ */ ! /* $Id: main.c,v 2.33 1998/09/03 18:41:55 shane Exp $ */ /* #define CRASH_DETECTION */ *************** *** 540,545 **** --- 540,546 ---- #if WIN32|WINNT if (php3_ini_master.use_registry) { _reg_get_server_config(GLOBAL(sapi_rqst)->server_name _INLINE_TLS); + _reg_get_directory_config(_INLINE_TLS_VOID); } #endif *************** *** 856,862 **** if (cfg_get_long( name, ((long *)address)) == FAILURE) { return 0; } ! #if 0 /* keep around a bit longer whilst I debug further */ else { char buf[20]; OutputDebugString(name); --- 857,863 ---- if (cfg_get_long( name, ((long *)address)) == FAILURE) { return 0; } ! #if 1 /* keep around a bit longer whilst I debug further */ else { char buf[20]; OutputDebugString(name); *************** *** 870,876 **** if (cfg_get_string( name, ((char **)address)) == FAILURE) { return 0; } ! #if 0 /* keep around a bit longer whilst I debug further */ else { OutputDebugString(name); OutputDebugString(" = "); --- 871,877 ---- if (cfg_get_string( name, ((char **)address)) == FAILURE) { return 0; } ! #if 1 /* keep around a bit longer whilst I debug further */ else { OutputDebugString(name); OutputDebugString(" = "); *************** *** 1450,1458 **** return FAILURE; } - #if WIN32|WINNT - _reg_get_directory_config(_INLINE_TLS_VOID); - #endif php3_treat_headers(_INLINE_TLS_VOID); --- 1451,1456 ---- -- PHP Development Mailing List http://www.php.net/ To unsubscribe send an empty message to php-dev-unsubscribe@lists.php.net For help: php-dev-help@lists.php.net