cvs: php4 /main fopen-wrappers.c main.c php_main.h php_virtual_cwd.c /win32 php4dll.dsp

zeev Sat Jul 29 03:48:58 2000 EDT Modified files: /php4/main fopen-wrappers.c main.c php_main.h php_virtual_cwd.c /php4/win32 php4dll.dsp Log: - Update .dsp's - Make non ZTS Win32 build again Index: php4/main/fopen-wrappers.c diff -u php4/main/fopen-wrappers.c:1.70 php4/main/fopen-wrappers.c:1.71 --- php4/main/fopen-wrappers.c:1.70 Sun Jun 25 10:02:46 2000 +++ php4/main/fopen-wrappers.c Sat Jul 29 03:48:57 2000 @@ -16,7 +16,7 @@ | Jim Winstead <jimw@php.net> | +----------------------------------------------------------------------+ */ -/* $Id: fopen-wrappers.c,v 1.70 2000/06/25 17:02:46 zeev Exp $ */ +/* $Id: fopen-wrappers.c,v 1.71 2000/07/29 10:48:57 zeev Exp $ */ #include "php.h" #include "php_globals.h" @@ -101,7 +101,8 @@ HashTable fopen_url_wrappers_hash; -PHPAPI int php_register_url_wrapper(char *protocol, FILE * (*wrapper)(const char *path, char *mode, int options, int *issock, int *socketd, char **opened_path)) { +PHPAPI int php_register_url_wrapper(char *protocol, FILE * (*wrapper)(const char *path, char *mode, int options, int *issock, int *socketd, char **opened_path)) +{ #if PHP_URL_FOPEN return zend_hash_add(&fopen_url_wrappers_hash, protocol, strlen(protocol)+1, &wrapper, sizeof(wrapper), NULL); #else @@ -109,7 +110,8 @@ #endif } -PHPAPI int php_unregister_url_wrapper(char *protocol) { +PHPAPI int php_unregister_url_wrapper(char *protocol) +{ #if PHP_URL_FOPEN return zend_hash_del(&fopen_url_wrappers_hash, protocol, strlen(protocol)+1); #else Index: php4/main/main.c diff -u php4/main/main.c:1.284 php4/main/main.c:1.285 --- php4/main/main.c:1.284 Fri Jul 28 08:21:19 2000 +++ php4/main/main.c Sat Jul 29 03:48:57 2000 @@ -19,7 +19,7 @@ */ -/* $Id: main.c,v 1.284 2000/07/28 15:21:19 hholzgra Exp $ */ +/* $Id: main.c,v 1.285 2000/07/29 10:48:57 zeev Exp $ */ #include <stdio.h> @@ -1184,7 +1184,7 @@ } #ifdef PHP_WIN32 - UpdateIniFromRegistry(primary_file->filename); + UpdateIniFromRegistry(file->filename); #endif EG(main_op_array) = zend_compile_files(ZEND_REQUIRE CLS_CC, 1, file); Index: php4/main/php_main.h diff -u php4/main/php_main.h:1.2 php4/main/php_main.h:1.3 --- php4/main/php_main.h:1.2 Sun Jul 2 17:45:20 2000 +++ php4/main/php_main.h Sat Jul 29 03:48:57 2000 @@ -18,7 +18,7 @@ */ -/* $Id: php_main.h,v 1.2 2000/07/03 00:45:20 sas Exp $ */ +/* $Id: php_main.h,v 1.3 2000/07/29 10:48:57 zeev Exp $ */ #ifndef PHP_MAIN_H @@ -41,6 +41,8 @@ PHPAPI int php_global_shutdown_extensions(zend_module_entry **ptr, int count); PHPAPI void php_execute_script(zend_file_handle *primary_file CLS_DC ELS_DC PLS_DC); +PHPAPI int php_lint_script(zend_file_handle *file CLS_DC ELS_DC PLS_DC); + extern void php_call_shutdown_functions(void); Index: php4/main/php_virtual_cwd.c diff -u php4/main/php_virtual_cwd.c:1.62 php4/main/php_virtual_cwd.c:1.63 --- php4/main/php_virtual_cwd.c:1.62 Sun Jul 23 22:41:00 2000 +++ php4/main/php_virtual_cwd.c Sat Jul 29 03:48:57 2000 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_virtual_cwd.c,v 1.62 2000/07/24 05:41:00 david Exp $ */ +/* $Id: php_virtual_cwd.c,v 1.63 2000/07/29 10:48:57 zeev Exp $ */ #include <sys/types.h> #include <sys/stat.h> @@ -43,7 +43,7 @@ #endif /* Only need mutex for popen() in Windows because it doesn't chdir() on UNIX */ -#ifdef ZEND_WIN32 +#if defined(ZEND_WIN32) && defined(ZTS) MUTEX_T cwd_mutex; #endif @@ -177,7 +177,7 @@ main_cwd_state.cwd_length = strlen(cwd); ZEND_INIT_MODULE_GLOBALS(cwd, cwd_globals_ctor, cwd_globals_dtor); -#ifdef ZEND_WIN32 +#if defined(ZEND_WIN32) && defined(ZTS) cwd_mutex = tsrm_mutex_alloc(); #endif } @@ -197,7 +197,7 @@ #ifndef ZTS cwd_globals_dtor(&cwd_globals); #endif -#ifdef ZEND_WIN32 +#if defined(ZEND_WIN32) && defined(ZTS) tsrm_mutex_free(cwd_mutex); #endif @@ -659,14 +659,18 @@ if (!getcwd_result) { return NULL; } - + +#ifdef ZTS tsrm_mutex_lock(cwd_mutex); +#endif chdir(CWDG(cwd).cwd); retval = popen(command, type); chdir(prev_cwd); +#ifdef ZTS tsrm_mutex_unlock(cwd_mutex); +#endif return retval; } Index: php4/win32/php4dll.dsp diff -u php4/win32/php4dll.dsp:1.1 php4/win32/php4dll.dsp:1.2 --- php4/win32/php4dll.dsp:1.1 Wed Jun 14 11:06:31 2000 +++ php4/win32/php4dll.dsp Sat Jul 29 03:48:57 2000 @@ -333,6 +333,10 @@ # End Source File # Begin Source File +SOURCE=..\ext\standard\crc32.c +# End Source File +# Begin Source File + SOURCE=..\ext\standard\datetime.c # End Source File # Begin Source File @@ -385,6 +389,10 @@ # End Source File # Begin Source File +SOURCE=..\ext\standard\incomplete_class.c +# End Source File +# Begin Source File + SOURCE=..\ext\standard\info.c # End Source File # Begin Source File @@ -788,12 +796,12 @@ # Begin Source File SOURCE=..\ext\wddx\wddx.c -# ADD CPP /I "..\Zend" /I ".." /I "..\regex" /I "..\..\bindlib_w32" /I "..\main" /I "..\ext\xml\expat\xmltok" /I "..\ext\xml\expat\xmlparse" +# ADD CPP /I "..\ext\xml\expat\xmltok" /I "..\ext\xml\expat\xmlparse" # End Source File # Begin Source File SOURCE=..\ext\xml\xml.c -# ADD CPP /I "..\Zend" /I ".." /I "..\regex" /I "..\..\bindlib_w32" /I "..\main" /I "..\ext\xml\expat\xmltok" /I "..\ext\xml\expat\xmlparse" +# ADD CPP /I "..\ext\xml\expat\xmltok" /I "..\ext\xml\expat\xmlparse" # End Source File # End Group # Begin Group "Header Files No. 4" @@ -813,22 +821,22 @@ # Begin Source File SOURCE=..\ext\xml\expat\xmlparse\hashtable.c -# ADD CPP /I "..\Zend" /I ".." /I "..\regex" /I "..\..\bindlib_w32" /I "..\main" /I "..\ext\xml\expat\xmltok" /I "..\ext\xml\expat\xmlparse" +# ADD CPP /I "..\ext\xml\expat\xmltok" /I "..\ext\xml\expat\xmlparse" # End Source File # Begin Source File SOURCE=..\ext\xml\expat\xmlparse\xmlparse.c -# ADD CPP /I "..\Zend" /I ".." /I "..\regex" /I "..\..\bindlib_w32" /I "..\main" /I "..\ext\xml\expat\xmltok" /I "..\ext\xml\expat\xmlparse" +# ADD CPP /I "..\ext\xml\expat\xmltok" /I "..\ext\xml\expat\xmlparse" # End Source File # Begin Source File SOURCE=..\ext\xml\expat\xmltok\xmlrole.c -# ADD CPP /I "..\Zend" /I ".." /I "..\regex" /I "..\..\bindlib_w32" /I "..\main" /I "..\ext\xml\expat\xmltok" /I "..\ext\xml\expat\xmlparse" +# ADD CPP /I "..\ext\xml\expat\xmltok" /I "..\ext\xml\expat\xmlparse" # End Source File # Begin Source File SOURCE=..\ext\xml\expat\xmltok\xmltok.c -# ADD CPP /I "..\Zend" /I ".." /I "..\regex" /I "..\..\bindlib_w32" /I "..\main" /I "..\ext\xml\expat\xmltok" /I "..\ext\xml\expat\xmlparse" +# ADD CPP /I "..\ext\xml\expat\xmltok" /I "..\ext\xml\expat\xmlparse" # End Source File # End Group # Begin Group "Header Files No. 5" @@ -920,7 +928,7 @@ # End Source File # Begin Source File -SOURCE=..\dl\snmp\winsnmp.c +SOURCE=..\ext\snmp\winsnmp.c # End Source File # Begin Source File