stas Wed Oct 20 11:27:25 2004 EDT
Modified files: (Branch: PHP_4_3)
/php-src/main output.c
Log:
fix HEAD problem: if some output is attempted in shutdown,
it bails out from shutdown sequence, which is bad
http://cvs.php.net/diff.php/php-src/main/output.c?r1=1.142.2.15&r2=1.142.2.16&ty=u
Index: php-src/main/output.c
diff -u php-src/main/output.c:1.142.2.15 php-src/main/output.c:1.142.2.16
--- php-src/main/output.c:1.142.2.15 Fri Aug 8 19:44:04 2003
+++ php-src/main/output.c Wed Oct 20 11:27:25 2004
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: output.c,v 1.142.2.15 2003/08/08 23:44:04 iliaa Exp $ */
+/* $Id: output.c,v 1.142.2.16 2004/10/20 15:27:25 stas Exp $ */
#include "php.h"
#include "ext/standard/head.h"
@@ -703,6 +703,9 @@
int result = 0;
if (SG(request_info).headers_only) {
+ if(SG(headers_sent)) {
+ return 0;
+ }
php_header();
zend_bailout();
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
