[PHP4BETA] CVS update: php4/ext/standard

Date: Friday April 23, 1999 @ 16:20 Author: zeev Update of /repository/php4/ext/standard In directory php:/tmp/cvs-serv27931/ext/standard Modified Files: head.c Log Message: Thread-safe header_is_being_sent Index: php4/ext/standard/head.c diff -u php4/ext/standard/head.c:1.2 php4/ext/standard/head.c:1.3 --- php4/ext/standard/head.c:1.2 Fri Apr 23 16:05:59 1999 +++ php4/ext/standard/head.c Fri Apr 23 16:20:30 1999 @@ -26,7 +26,7 @@ | Authors: Rasmus Lerdorf <rasmus@lerdorf.on.ca> | +----------------------------------------------------------------------+ */ -/* $Id: head.c,v 1.2 1999/04/23 20:05:59 zeev Exp $ */ +/* $Id: head.c,v 1.3 1999/04/23 20:20:30 zeev Exp $ */ #include <stdio.h> #include "php.h" @@ -236,17 +236,17 @@ #if APACHE || defined(USE_SAPI) || FHTTPD char *tempstr; #endif -TLS_VARS; + PLS_FETCH(); - if (GLOBAL(header_is_being_sent)) { + if (PG(header_is_being_sent)) { return 0; } else { - GLOBAL(header_is_being_sent) = 1; + PG(header_is_being_sent) = 1; } #if APACHE if (!GLOBAL(php3_rqst)) { /* we're not in a request, allow output */ - GLOBAL(header_is_being_sent) = 0; + PG(header_is_being_sent) = 0; return 1; } if ((GLOBAL(php3_PrintHeader) && !GLOBAL(php3_HeaderPrinted)) || (GLOBAL(php3_PrintHeader) && GLOBAL(php3_HeaderPrinted) == 2)) { @@ -324,7 +324,7 @@ send_http_header(GLOBAL(php3_rqst)); if (GLOBAL(php3_rqst)->header_only) { set_header_request(1); - GLOBAL(header_is_being_sent) = 0; + PG(header_is_being_sent) = 0; return(0); } } @@ -382,7 +382,7 @@ GLOBAL(header_called) = 1; } #endif - GLOBAL(header_is_being_sent) = 0; + PG(header_is_being_sent) = 0; return(1); } -- PHP 4 Beta