jani            Tue May 26 04:47:05 2009 UTC

  Modified files:              (Branch: PHP_5_2)
    /php-src    NEWS 
    /php-src/ext/zlib   zlib.c 
  Log:
  MFH:- Fixed bug #42362 (HTTP status codes 204 and 304 should not be gzipped)
  
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1519&r2=1.2027.2.547.2.1520&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.1519 php-src/NEWS:1.2027.2.547.2.1520
--- php-src/NEWS:1.2027.2.547.2.1519    Mon May 25 16:30:37 2009
+++ php-src/NEWS        Tue May 26 04:47:04 2009
@@ -125,6 +125,8 @@
   data). (Arnaud)
 - Fixed bug #42414 (some odbc_*() functions incompatible with Oracle ODBC 
   driver). (jhml at gmx dot net)
+- Fixed bug #42362 (HTTP status codes 204 and 304 should not be gzipped).
+  (Scott, Edward Z. Yang)
 - Fixed bug #38805 (PDO truncates text from SQL Server text data type
   field). (Steph)
 
http://cvs.php.net/viewvc.cgi/php-src/ext/zlib/zlib.c?r1=1.183.2.6.2.10&r2=1.183.2.6.2.11&diff_format=u
Index: php-src/ext/zlib/zlib.c
diff -u php-src/ext/zlib/zlib.c:1.183.2.6.2.10 
php-src/ext/zlib/zlib.c:1.183.2.6.2.11
--- php-src/ext/zlib/zlib.c:1.183.2.6.2.10      Tue May 26 04:45:21 2009
+++ php-src/ext/zlib/zlib.c     Tue May 26 04:47:05 2009
@@ -19,7 +19,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: zlib.c,v 1.183.2.6.2.10 2009/05/26 04:45:21 jani Exp $ */
+/* $Id: zlib.c,v 1.183.2.6.2.11 2009/05/26 04:47:05 jani Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -987,7 +987,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

Reply via email to