scottmac Tue Mar 24 01:57:54 2009 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/zlib zlib.c
Log:
Fix bug #42362 - certain status codes never have output, so sending the gzip
compression headers cause problems
http://cvs.php.net/viewvc.cgi/php-src/ext/zlib/zlib.c?r1=1.183.2.6.2.5.2.9&r2=1.183.2.6.2.5.2.10&diff_format=u
Index: php-src/ext/zlib/zlib.c
diff -u php-src/ext/zlib/zlib.c:1.183.2.6.2.5.2.9
php-src/ext/zlib/zlib.c:1.183.2.6.2.5.2.10
--- php-src/ext/zlib/zlib.c:1.183.2.6.2.5.2.9 Wed Dec 31 11:15:47 2008
+++ php-src/ext/zlib/zlib.c Tue Mar 24 01:57:53 2009
@@ -19,7 +19,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: zlib.c,v 1.183.2.6.2.5.2.9 2008/12/31 11:15:47 sebastian Exp $ */
+/* $Id: zlib.c,v 1.183.2.6.2.5.2.10 2009/03/24 01:57:53 scottmac Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -1034,7 +1034,7 @@
{
zend_bool do_start, do_end;
- if (!ZLIBG(output_compression)) {
+ if (!ZLIBG(output_compression) || SG(sapi_headers).http_response_code
== 204 || SG(sapi_headers).http_response_code == 304) {
*handled_output = NULL;
} else {
do_start = (mode & PHP_OUTPUT_HANDLER_START ? 1 : 0);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
