cvs: php-src /main output.c

From: Date: Wed, 20 Oct 2004 15:31:06 +0000
Subject: cvs: php-src /main output.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-28996@lists.php.net to get a copy of this message
stas Wed Oct 20 11:31:06 2004 EDT Modified files: /php-src/main output.c Log: MF4: fix double bailout in HEAD when output is attempted from shutdown http://cvs.php.net/diff.php/php-src/main/output.c?r1=1.164&r2=1.165&ty=u Index: php-src/main/output.c diff -u php-src/main/output.c:1.164 php-src/main/output.c:1.165 --- php-src/main/output.c:1.164 Sun Mar 14 18:56:07 2004 +++ php-src/main/output.c Wed Oct 20 11:31:06 2004 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: output.c,v 1.164 2004/03/14 23:56:07 helly Exp $ */ +/* $Id: output.c,v 1.165 2004/10/20 15:31:06 stas Exp $ */ #include "php.h" #include "ext/standard/head.h" @@ -698,6 +698,9 @@ int result = 0; if (SG(request_info).headers_only) { + if(SG(headers_sent)) { + return 0; + } php_header(TSRMLS_C); zend_bailout(); }

« previous php.cvs (#28996) next »