iliaa Wed Oct 19 16:30:42 2005 EDT
Modified files:
/php-src/main SAPI.c
Log:
Fixed bug #29983 (PHP does not explicitly set mime type & charset).
http://cvs.php.net/diff.php/php-src/main/SAPI.c?r1=1.203&r2=1.204&ty=u
Index: php-src/main/SAPI.c
diff -u php-src/main/SAPI.c:1.203 php-src/main/SAPI.c:1.204
--- php-src/main/SAPI.c:1.203 Thu Aug 11 19:36:02 2005
+++ php-src/main/SAPI.c Wed Oct 19 16:30:38 2005
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: SAPI.c,v 1.203 2005/08/11 23:36:02 andrei Exp $ */
+/* $Id: SAPI.c,v 1.204 2005/10/19 20:30:38 iliaa Exp $ */
#include <ctype.h>
#include <sys/stat.h>
@@ -794,6 +794,12 @@
/* Success-oriented. We set headers_sent to 1 here to avoid an
infinite loop
* in case of an error situation.
*/
+ if (SG(sapi_headers).send_default_content_type &&
sapi_module.send_headers) {
+ sapi_header_struct default_header;
+ sapi_get_default_content_type_header(&default_header TSRMLS_CC);
+ sapi_add_header_ex(default_header.header,
default_header.header_len, 0, 0 TSRMLS_CC);
+ }
+
SG(headers_sent) = 1;
if (sapi_module.send_headers) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
