gschlossnagle Wed Dec 25 16:14:56 2002 EDT
Modified files: (Branch: PHP_4_3)
/php4/sapi/cgi cgi_main.c
Log:
mfh (bug #21177)
Index: php4/sapi/cgi/cgi_main.c
diff -u php4/sapi/cgi/cgi_main.c:1.190.2.8 php4/sapi/cgi/cgi_main.c:1.190.2.9
--- php4/sapi/cgi/cgi_main.c:1.190.2.8 Tue Dec 24 18:50:21 2002
+++ php4/sapi/cgi/cgi_main.c Wed Dec 25 16:14:55 2002
@@ -265,6 +265,9 @@
zend_llist_position pos;
long rfc2616_headers = 0;
+ if(SG(request_info).no_headers == 1) {
+ return SAPI_HEADER_SENT_SUCCESSFULLY;
+ }
/* Check wheater to send RFC2616 style headers compatible with
* PHP versions 4.2.3 and earlier compatible with web servers
* such as IIS. Default is informal CGI RFC header compatible
@@ -1379,6 +1382,10 @@
php_module_shutdown(TSRMLS_C);
return FAILURE;
}
+ if (no_headers) {
+ SG(headers_sent) = 1;
+ SG(request_info).no_headers = 1;
+ }
/* This actually destructs the elements of the list - ugly hack */
zend_llist_apply(&global_vars, (llist_apply_func_t)
php_register_command_line_global_vars TSRMLS_CC);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
