cvs: php4 / NEWS /main SAPI.c php.h win95nt.h

dbeu Fri Apr 27 09:41:55 2001 EDT Modified files: /php4 NEWS /php4/main SAPI.c php.h win95nt.h Log: get rid of MS's _popen/_pclose Index: php4/NEWS diff -u php4/NEWS:1.637 php4/NEWS:1.638 --- php4/NEWS:1.637 Wed Apr 25 18:57:03 2001 +++ php4/NEWS Fri Apr 27 09:41:51 2001 @@ -2,6 +2,7 @@ ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| ?? ??? 200?, Version 4.0.6 +- Fix popen() and the exec family under Win32 (Unable to fork issue) (Daniel) - Make the printf family of functions binary clean (Rasmus) - Fixed WDDX serialization to HTML-escape key/variable names so as not to break the XML packet. (Andrei) Index: php4/main/SAPI.c diff -u php4/main/SAPI.c:1.102 php4/main/SAPI.c:1.103 --- php4/main/SAPI.c:1.102 Sun Mar 18 00:00:10 2001 +++ php4/main/SAPI.c Fri Apr 27 09:41:53 2001 @@ -73,6 +73,10 @@ virtual_cwd_startup(); /* Could use shutdown to free the main cwd but it would just slow it down for CGI */ #endif +#ifdef PHP_WIN32 + tsrm_win32_startup(); +#endif + reentrancy_startup(); php_global_startup_internal_extensions(); @@ -84,6 +88,11 @@ #ifdef VIRTUAL_DIR virtual_cwd_shutdown(); #endif + +#ifdef PHP_WIN32 + tsrm_win32_shutdown(); +#endif + php_global_shutdown_internal_extensions(); zend_hash_destroy(&known_post_content_types); } Index: php4/main/php.h diff -u php4/main/php.h:1.135 php4/main/php.h:1.136 --- php4/main/php.h:1.135 Tue Apr 17 10:03:18 2001 +++ php4/main/php.h Fri Apr 27 09:41:53 2001 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php.h,v 1.135 2001/04/17 17:03:18 wez Exp $ */ +/* $Id: php.h,v 1.136 2001/04/27 16:41:53 dbeu Exp $ */ #ifndef PHP_H #define PHP_H @@ -42,6 +42,7 @@ #endif #ifdef PHP_WIN32 +#include "tsrm_win32.h" #include "win95nt.h" # ifdef PHP_EXPORTS # define PHPAPI __declspec(dllexport) Index: php4/main/win95nt.h diff -u php4/main/win95nt.h:1.9 php4/main/win95nt.h:1.10 --- php4/main/win95nt.h:1.9 Tue Oct 31 10:05:19 2000 +++ php4/main/win95nt.h Fri Apr 27 09:41:53 2001 @@ -18,8 +18,6 @@ #define S_IFIFO _IFIFO #define S_IFBLK _IFBLK #define S_IFLNK _IFLNK -#define pclose(a) _pclose(a) -#define popen(a, b) _popen(a, b) #define chdir(path) SetCurrentDirectory(path) #define mkdir(a,b) _mkdir(a) #define rmdir(a) _rmdir(a)