diff options
| author | Ilia Alshanetsky <iliaa@php.net> | 2005-10-19 20:36:22 +0000 |
|---|---|---|
| committer | Ilia Alshanetsky <iliaa@php.net> | 2005-10-19 20:36:22 +0000 |
| commit | b8973a09deed6161e60ebf08cec69b13fe59d43f (patch) | |
| tree | 36038fdae81dda2cdc55eb200062d347cd504652 | |
| parent | 7d1ec21215694222da297fabae97624c901d995d (diff) | |
| download | php-git-b8973a09deed6161e60ebf08cec69b13fe59d43f.tar.gz | |
MFH: Fixed bug #29983 (PHP does not explicitly set mime type & charset).
| -rw-r--r-- | NEWS | 1 | ||||
| -rw-r--r-- | main/SAPI.c | 6 |
2 files changed, 7 insertions, 0 deletions
@@ -10,6 +10,7 @@ PHP 4 NEWS 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) diff --git a/main/SAPI.c b/main/SAPI.c index b5d896d247..8d9f4a23fb 100644 --- a/main/SAPI.c +++ b/main/SAPI.c @@ -745,6 +745,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) { |