iliaa Wed Oct 19 16:36:25 2005 EDT
Modified files: (Branch: PHP_4_4)
/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.155.2.24&r2=1.155.2.24.2.1&ty=u
Index: php-src/main/SAPI.c
diff -u php-src/main/SAPI.c:1.155.2.24 php-src/main/SAPI.c:1.155.2.24.2.1
--- php-src/main/SAPI.c:1.155.2.24 Tue Feb 22 09:46:24 2005
+++ php-src/main/SAPI.c Wed Oct 19 16:36:19 2005
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: SAPI.c,v 1.155.2.24 2005/02/22 14:46:24 sniper Exp $ */
+/* $Id: SAPI.c,v 1.155.2.24.2.1 2005/10/19 20:36:19 iliaa Exp $ */
#include <ctype.h>
#include <sys/stat.h>
@@ -745,6 +745,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.1247.2.920.2.58&r2=1.1247.2.920.2.59&ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1247.2.920.2.58 php-src/NEWS:1.1247.2.920.2.59
--- php-src/NEWS:1.1247.2.920.2.58 Mon Oct 17 11:43:12 2005
+++ php-src/NEWS Wed Oct 19 16:36:22 2005
@@ -10,6 +10,7 @@
transfer). (Ilia)
- Fixed bug #34704 (Infinite recursion due to corrupt JPEG). (Marcus)
- Fixed bug #33383 (crash when retrieving empty LOBs). (Tony)
+- Fixed bug #29983 (PHP does not explicitly set mime type & charset). (Ilia)
07 Oct 2005, Version 4.4.1RC1
- Added missing safe_mode checks for image* functions and cURL. (Ilia)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
