iliaa Wed Oct 19 16:33:34 2005 EDT
Modified files: (Branch: PHP_5_1)
/php-src/main SAPI.c
/php-src NEWS
Log:
MFH: Fixed bug #29983 (PHP does not explicitly set mime type & charset).
http://cvs.php.net/diff.php/php-src/main/SAPI.c?r1=1.202&r2=1.202.2.1&ty=u
Index: php-src/main/SAPI.c
diff -u php-src/main/SAPI.c:1.202 php-src/main/SAPI.c:1.202.2.1
--- php-src/main/SAPI.c:1.202 Wed Aug 3 10:08:25 2005
+++ php-src/main/SAPI.c Wed Oct 19 16:33:33 2005
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: SAPI.c,v 1.202 2005/08/03 14:08:25 sniper Exp $ */
+/* $Id: SAPI.c,v 1.202.2.1 2005/10/19 20:33:33 iliaa Exp $ */
#include <ctype.h>
#include <sys/stat.h>
@@ -772,6 +772,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) {
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.2027.2.142&r2=1.2027.2.143&ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.142 php-src/NEWS:1.2027.2.143
--- php-src/NEWS:1.2027.2.142 Wed Oct 19 10:11:56 2005
+++ php-src/NEWS Wed Oct 19 16:33:33 2005
@@ -7,6 +7,7 @@
- Fixed bug #33829 (mime_content_type() returns text/plain for gzip and bzip
files). (Derick)
- Fixed bug #34623 (Crash in pdo_mysql on longtext fields). (Ilia)
+- Fixed bug #29983 (PHP does not explicitly set mime type & charset). (Ilia)
17 Oct 2005, PHP 5.1 Release Candidate 3
- Fixed bug #34873 (Segmentation Fault on foreach in object). (Dmitry)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
