CVS update: php31/main

Date: Wednesday September 2, 1998 @ 15:18 Author: shane Update of /repository/php31/main In directory asf:/u2/tmp/cvs-serv13382/main Modified Files: configuration-parser.y internal_functions.c main.c Log Message: reading ini from registry working now, now to do per-server Index: php31/main/configuration-parser.y diff -c php31/main/configuration-parser.y:2.3 php31/main/configuration-parser.y:2.4 *** php31/main/configuration-parser.y:2.3 Tue Sep 1 13:43:30 1998 --- php31/main/configuration-parser.y Wed Sep 2 15:18:22 1998 *************** *** 30,36 **** ! /* $Id: configuration-parser.y,v 2.3 1998/09/01 17:43:30 zeev Exp $ */ #define DEBUG_CFG_PARSER 1 #ifdef THREAD_SAFE --- 30,36 ---- ! /* $Id: configuration-parser.y,v 2.4 1998/09/02 19:18:22 shane Exp $ */ #define DEBUG_CFG_PARSER 1 #ifdef THREAD_SAFE *************** *** 38,44 **** #endif #include "php.h" #include "modules.h" ! #include "ext/standard/dl.h" #include "ext/standard/file.h" #include "ext/standard/php3_browscap.h" #if WIN32 --- 38,44 ---- #endif #include "php.h" #include "modules.h" ! #include "dl.h" #include "ext/standard/file.h" #include "ext/standard/php3_browscap.h" #if WIN32 *************** *** 46,57 **** #include <windows.h> #include <winbase.h> #include "os/nt/wfile.h" #endif #define PARSING_MODE_CFG 0 #define PARSING_MODE_BROWSCAP 1 ! static HashTable configuration_hash; #ifndef THREAD_SAFE extern HashTable browser_hash; #endif --- 46,58 ---- #include <windows.h> #include <winbase.h> #include "os/nt/wfile.h" + #include "os/nt/registry.h" #endif #define PARSING_MODE_CFG 0 #define PARSING_MODE_BROWSCAP 1 ! HashTable configuration_hash; #ifndef THREAD_SAFE extern HashTable browser_hash; #endif *************** *** 137,150 **** } - #if WIN32|WINNT - int reg_get_default_config(void){ - /* FIXME implement reading ini vars from registry, and inserting - into the hash */ - return 0; - } - #endif - int php3_init_config(void) { TLS_VARS; --- 138,143 ---- *************** *** 156,162 **** #if USE_CONFIG_FILE #if WIN32|WINNT /*check to see if we can use the registry to get our variables*/ ! if(!reg_get_default_config()) #endif { char *env_location,*default_location,*php_ini_path; --- 149,155 ---- #if USE_CONFIG_FILE #if WIN32|WINNT /*check to see if we can use the registry to get our variables*/ ! if(!_reg_get_default_config(_INLINE_TLS_VOID)) #endif { char *env_location,*default_location,*php_ini_path; Index: php31/main/internal_functions.c diff -c php31/main/internal_functions.c:2.6 php31/main/internal_functions.c:2.7 *** php31/main/internal_functions.c:2.6 Tue Sep 1 12:58:41 1998 --- php31/main/internal_functions.c Wed Sep 2 15:18:23 1998 *************** *** 29,35 **** */ ! /* $Id: internal_functions.c,v 2.6 1998/09/01 16:58:41 shane Exp $ */ #ifdef THREAD_SAFE #include "tls.h" --- 29,35 ---- */ ! /* $Id: internal_functions.c,v 2.7 1998/09/02 19:18:23 shane Exp $ */ #ifdef THREAD_SAFE #include "tls.h" *************** *** 63,69 **** #include "ext/standard/md5.h" #include "ext/gd/php3_gd.h" #include "ext/standard/html.h" ! #include "ext/standard/dl.h" #include "head.h" #include "post.h" #include "ext/standard/exec.h" --- 63,69 ---- #include "ext/standard/md5.h" #include "ext/gd/php3_gd.h" #include "ext/standard/html.h" ! #include "dl.h" #include "head.h" #include "post.h" #include "ext/standard/exec.h" Index: php31/main/main.c diff -c php31/main/main.c:2.30 php31/main/main.c:2.31 *** php31/main/main.c:2.30 Sun Aug 30 02:45:21 1998 --- php31/main/main.c Wed Sep 2 15:18:24 1998 *************** *** 29,35 **** +----------------------------------------------------------------------+ */ ! /* $Id: main.c,v 2.30 1998/08/30 06:45:21 shane Exp $ */ /* #define CRASH_DETECTION */ --- 29,35 ---- +----------------------------------------------------------------------+ */ ! /* $Id: main.c,v 2.31 1998/09/02 19:18:24 shane Exp $ */ /* #define CRASH_DETECTION */ *************** *** 73,84 **** #include "highlight.h" #include "php3_list.h" #include "snprintf.h" ! #include "ext/standard/dl.h" #include "string_buffer.h" #if WIN32|WINNT #include <io.h> #include <fcntl.h> #include "os/nt/syslog.h" #else #include <syslog.h> #endif --- 73,85 ---- #include "highlight.h" #include "php3_list.h" #include "snprintf.h" ! #include "dl.h" #include "string_buffer.h" #if WIN32|WINNT #include <io.h> #include <fcntl.h> #include "os/nt/syslog.h" + #include "os/nt/registry.h" #else #include <syslog.h> #endif *************** *** 1073,1078 **** --- 1074,1084 ---- } GLOBAL(le_index_ptr) = _register_list_destructors(NULL, NULL, 0); GLOBAL(module_initialized) |= INIT_LIST_DESTRUCTORS; + + /* initialize registry list destructors */ + #if WIN32|WINNT + _php3_win32_reg_init(_INLINE_TLS_VOID); + #endif /* persistent list */ if (init_resource_plist() == FAILURE) { -- 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