MFH: Fixed bug #29983 (PHP does not explicitly set mime type & charset).

21 years ago · 382bc9d0e4
2 changed files with 7 additions and 0 deletions
--- a/1
+++ b/1
@ -7,6 +7,7 @@ PHP                                                                        NEWS
 - 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)
--- a/main/SAPI.c
+++ b/main/SAPI.c
@ -772,6 +772,12 @@ SAPI_API int sapi_send_headers(TSRMLS_D)
 	/* 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) {