[PHP4BETA] CVS update: php4

Date: Friday April 23, 1999 @ 16:20 Author: zeev Update of /repository/php4 In directory php:/tmp/cvs-serv27931 Modified Files: main.c main.h php_globals.h Log Message: Thread-safe header_is_being_sent Index: php4/main.c diff -u php4/main.c:1.26 php4/main.c:1.27 --- php4/main.c:1.26 Fri Apr 23 16:05:52 1999 +++ php4/main.c Fri Apr 23 16:20:30 1999 @@ -29,7 +29,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: main.c,v 1.26 1999/04/23 20:05:52 zeev Exp $ */ +/* $Id: main.c,v 1.27 1999/04/23 20:20:30 zeev Exp $ */ #define SHUTDOWN_DEBUG(resource) fprintf(stderr, "*** Shutting down " resource "\n" ) @@ -250,7 +250,6 @@ */ int initialized; /* keep track of which resources were successfully initialized */ static int module_initialized = 0; -unsigned char header_is_being_sent; #if WIN32|WINNT unsigned int wintimer; @@ -648,7 +647,7 @@ /* initialize global variables */ { - GLOBAL(header_is_being_sent) = 0; + PG(header_is_being_sent)=0; } if (php3_init_request_info(NULL)) { Index: php4/main.h diff -u php4/main.h:1.2 php4/main.h:1.3 --- php4/main.h:1.2 Wed Apr 21 00:02:11 1999 +++ php4/main.h Fri Apr 23 16:20:30 1999 @@ -29,7 +29,7 @@ */ -/* $Id: main.h,v 1.2 1999/04/21 04:02:11 zeev Exp $ */ +/* $Id: main.h,v 1.3 1999/04/23 20:20:30 zeev Exp $ */ #ifndef _MAIN_H @@ -55,7 +55,6 @@ extern void php3_module_shutdown_for_exec(void); #ifndef THREAD_SAFE -extern unsigned char header_is_being_sent; extern int initialized; #endif Index: php4/php_globals.h diff -u php4/php_globals.h:1.6 php4/php_globals.h:1.7 --- php4/php_globals.h:1.6 Wed Apr 21 00:02:11 1999 +++ php4/php_globals.h Fri Apr 23 16:20:30 1999 @@ -63,7 +63,9 @@ long track_vars; long y2k_compliance; + + unsigned char header_is_being_sent; }; -#endif /* _PHP_GLOBALS_H */ \ No newline at end of file +#endif /* _PHP_GLOBALS_H */ -- PHP 4 Beta