- Try disabling zlib.output_compression always for images. (zlib extension might...

diff --git a/main/SAPI.c b/main/SAPI.c
index f69790aa84669de01e94e98ed1224617612b467f..47bd398f6445bbdb26bf3ed4852be6b609112a8c 100644 (file)
--- a/main/SAPI.c
+++ b/main/SAPI.c
@@ -29,9 +29,6 @@
 #include "php_ini.h"
 #include "ext/standard/php_string.h"
 #include "ext/standard/pageinfo.h"
-#if HAVE_ZLIB
-#include "ext/zlib/php_zlib.h"
-#endif
 #ifdef ZTS
 #include "TSRM.h"
 #endif
@@ -657,11 +654,12 @@ SAPI_API int sapi_header_op(sapi_header_op_enum op, void *arg TSRMLS_DC)
                                        ptr++;
                                        len--;
                                }
-#if HAVE_ZLIB
+
+                               /* Disable possible output compression for images */
                                if (!strncmp(ptr, "image/", sizeof("image/")-1)) {
                                        zend_alter_ini_entry("zlib.output_compression", sizeof("zlib.output_compression"), "0", sizeof("0") - 1, PHP_INI_USER, PHP_INI_STAGE_RUNTIME);
                                }
-#endif
+
                                mimetype = estrdup(ptr);
                                newlen = sapi_apply_default_charset(&mimetype, len TSRMLS_CC);
                                if (!SG(sapi_headers).mimetype){