CVS update: php31/main

Date: Thursday August 27, 1998 @ 16:55 Author: shane Update of /repository/php31/main In directory asf:/u2/tmp/cvs-serv1720/main Modified Files: automated_configuration.h list.c main.c php.h php3_list.h tls.h Log Message: Various fixes ldap now works with 3.1 moved dl close in request shutdown because it errored out if a loaded module used a list. moved module defines into msvc project files rather thwn config.w32.h Index: php31/main/automated_configuration.h diff -c php31/main/automated_configuration.h:2.3 php31/main/automated_configuration.h:2.4 *** php31/main/automated_configuration.h:2.3 Thu Aug 27 01:01:11 1998 --- php31/main/automated_configuration.h Thu Aug 27 16:55:44 1998 *************** *** 29,34 **** --- 29,35 ---- INI_ENTRY(error_reporting, AC_LONG, 7, AC_YES, "Error reporting level") INI_ENTRY(display_errors, AC_BOOL, 1, AC_YES, "Display error messags") INI_ENTRY(log_errors, AC_BOOL, 0, AC_NO, "Log error messages") + INI_ENTRY(errors, AC_BOOL, 0, AC_NO, "apache errors") INI_ENTRY(track_errors, AC_BOOL, 0, AC_YES, "Track errors in $php_errormsg") INI_ENTRY(warn_plus_overloading,AC_BOOL, 0, AC_YES, "Warn when + is used with strings") INI_ENTRY(error_log, AC_STRING, NULL, AC_YES, "device on which to log errors") Index: php31/main/list.c diff -c php31/main/list.c:2.1 php31/main/list.c:2.2 *** php31/main/list.c:2.1 Tue Aug 25 14:56:40 1998 --- php31/main/list.c Thu Aug 27 16:55:44 1998 *************** *** 29,35 **** */ ! /* $Id: list.c,v 2.1 1998/08/25 18:56:40 rasmus Exp $ */ #ifdef THREAD_SAFE #include "tls.h" --- 29,35 ---- */ ! /* $Id: list.c,v 2.2 1998/08/27 20:55:44 shane Exp $ */ #ifdef THREAD_SAFE #include "tls.h" *************** *** 50,56 **** --- 50,61 ---- #endif /* HashTable list,plist; */ + #ifdef THREAD_SAFE + /*FIXME this is a quick fix to get this var in external modules */ + PHPAPI int _php3_le_index_ptr(void){TLS_VARS; return GLOBAL(le_index_ptr);} + #else PHPAPI int le_index_ptr; + #endif PHPAPI int php3_list_do_insert(HashTable *list,void *ptr, int type) { Index: php31/main/main.c diff -c php31/main/main.c:2.25 php31/main/main.c:2.26 *** php31/main/main.c:2.25 Thu Aug 27 01:01:11 1998 --- php31/main/main.c Thu Aug 27 16:55:44 1998 *************** *** 29,35 **** +----------------------------------------------------------------------+ */ ! /* $Id: main.c,v 2.25 1998/08/27 05:01:11 shane Exp $ */ /* #define CRASH_DETECTION */ --- 29,35 ---- +----------------------------------------------------------------------+ */ ! /* $Id: main.c,v 2.26 1998/08/27 20:55:44 shane Exp $ */ /* #define CRASH_DETECTION */ *************** *** 672,679 **** #if defined(CRASH_DETECTION) debug_log("php3_request_shutdown()"); #endif - /* clean temporary dl's, run request shutdown's for modules */ - _php3_hash_apply(&GLOBAL(module_registry), (int (*)(void *)) module_registry_cleanup); if (GLOBAL(initialized) & INIT_SYMBOL_TABLE) { _php3_hash_destroy(&GLOBAL(symbol_table)); --- 672,677 ---- *************** *** 789,794 **** --- 787,795 ---- GLOBAL(initialized) &= ~INIT_LIST; } + /* clean temporary dl's, run request shutdown's for modules */ + _php3_hash_apply(&GLOBAL(module_registry), (int (*)(void *)) module_registry_cleanup); + #if 0 debug_log("%d:INIT_LIST\n",GetCurrentThreadId()); #endif *************** *** 1070,1076 **** php3_printf("Unable to initialize resource list destructors hash.\n"); return FAILURE; } ! le_index_ptr = _register_list_destructors(NULL, NULL, 0); GLOBAL(module_initialized) |= INIT_LIST_DESTRUCTORS; /* persistent list */ --- 1071,1077 ---- php3_printf("Unable to initialize resource list destructors hash.\n"); return FAILURE; } ! GLOBAL(le_index_ptr) = _register_list_destructors(NULL, NULL, 0); GLOBAL(module_initialized) |= INIT_LIST_DESTRUCTORS; /* persistent list */ Index: php31/main/php.h diff -c php31/main/php.h:2.10 php31/main/php.h:2.11 *** php31/main/php.h:2.10 Sat Aug 22 09:46:32 1998 --- php31/main/php.h Thu Aug 27 16:55:45 1998 *************** *** 28,34 **** +----------------------------------------------------------------------+ */ ! /* $Id: php.h,v 2.10 1998/08/22 13:46:32 rasmus Exp $ */ #ifndef _PHP_H #define _PHP_H --- 28,34 ---- +----------------------------------------------------------------------+ */ ! /* $Id: php.h,v 2.11 1998/08/27 20:55:45 shane Exp $ */ #ifndef _PHP_H #define _PHP_H *************** *** 363,371 **** extern char **environ; #endif #endif - extern PHPAPI int le_index_ptr; /* list entry type for index pointers */ ! #ifndef THREAD_SAFE extern int phplex(pval *phplval); #endif --- 363,374 ---- extern char **environ; #endif #endif ! #ifdef THREAD_SAFE ! /*FIXME this is a quick fix to get this var in external modules */ ! PHPAPI int _php3_le_index_ptr(void); ! #else ! extern PHPAPI int le_index_ptr; /* list entry type for index pointers */ extern int phplex(pval *phplval); #endif Index: php31/main/php3_list.h diff -c php31/main/php3_list.h:2.0 php31/main/php3_list.h:2.1 *** php31/main/php3_list.h:2.0 Fri Jul 3 09:17:28 1998 --- php31/main/php3_list.h Thu Aug 27 16:55:45 1998 *************** *** 29,35 **** */ ! /* $Id: php3_list.h,v 2.0 1998/07/03 13:17:28 rasmus Exp $ */ #ifndef _LIST_H --- 29,35 ---- */ ! /* $Id: php3_list.h,v 2.1 1998/08/27 20:55:45 shane Exp $ */ #ifndef _LIST_H *************** *** 64,76 **** extern PHPAPI void list_entry_destructor(void *ptr); extern PHPAPI void plist_entry_destructor(void *ptr); ! #define php3_list_insert(ptr,type) php3_list_do_insert(list,(ptr),(type)) ! #define php3_list_delete(id) php3_list_do_delete(list,id) ! #define php3_list_find(id,type) php3_list_do_find(list, (id),(type)) ! ! #define php3_plist_insert(ptr,type) php3_list_do_insert(plist,(ptr),(type)) ! #define php3_plist_delete(id) php3_list_do_delete(plist,id) ! #define php3_plist_find(id,type) php3_list_do_find(plist,(id),(type)) extern int clean_module_resource_destructors(list_destructors_entry *ld, int *module_number); --- 64,76 ---- extern PHPAPI void list_entry_destructor(void *ptr); extern PHPAPI void plist_entry_destructor(void *ptr); ! #define php3_list_insert(ptr,type) php3_list_do_insert((list),(ptr),(type)) ! #define php3_list_delete(id) php3_list_do_delete((list),id) ! #define php3_list_find(id,type) php3_list_do_find((list), (id),(type)) ! ! #define php3_plist_insert(ptr,type) php3_list_do_insert((plist),(ptr),(type)) ! #define php3_plist_delete(id) php3_list_do_delete((plist),id) ! #define php3_plist_find(id,type) php3_list_do_find((plist),(id),(type)) extern int clean_module_resource_destructors(list_destructors_entry *ld, int *module_number); Index: php31/main/tls.h diff -c php31/main/tls.h:2.8 php31/main/tls.h:2.9 *** php31/main/tls.h:2.8 Tue Aug 25 14:56:41 1998 --- php31/main/tls.h Thu Aug 27 16:55:45 1998 *************** *** 111,116 **** --- 111,117 ---- HashTable plist; int module_count; int current_module_being_cleaned; + int le_index_ptr; /*main.c*/ unsigned int client_alive; php3_ini_structure *php3_ini; -- 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