aharvey                                  Thu, 11 Mar 2010 06:20:22 +0000

Revision: http://svn.php.net/viewvc?view=revision&revision=296060

Log:
Fixed bug #51269 (zlib.output_compression Overwrites Vary Header).

Bug: http://bugs.php.net/51269 (Assigned) zlib.output_compression Overwrites 
Vary Header
      
Changed paths:
    U   php/php-src/branches/PHP_5_2/NEWS
    A   php/php-src/branches/PHP_5_2/ext/zlib/tests/bug51269.phpt
    U   php/php-src/branches/PHP_5_2/ext/zlib/zlib.c
    U   php/php-src/branches/PHP_5_3/NEWS
    A   php/php-src/branches/PHP_5_3/ext/zlib/tests/bug51269.phpt
    U   php/php-src/branches/PHP_5_3/ext/zlib/zlib.c
    A   php/php-src/trunk/ext/zlib/tests/bug51269.phpt
    U   php/php-src/trunk/ext/zlib/zlib.c

Modified: php/php-src/branches/PHP_5_2/NEWS
===================================================================
--- php/php-src/branches/PHP_5_2/NEWS   2010-03-11 06:16:34 UTC (rev 296059)
+++ php/php-src/branches/PHP_5_2/NEWS   2010-03-11 06:20:22 UTC (rev 296060)
@@ -3,6 +3,7 @@
 ?? ??? 2010, PHP 5.2.14
 - Updated timezone database to version 2010.3. (Derick)

+- Fixed bug #51269 (zlib.output_compression Overwrites Vary Header). (Adam)
 - Fixed bug #51237 (milter SAPI crash on startup). (igmar at palsenberg dot 
com)
 - Fixed bug #51213 (pdo_mssql is trimming value of the money column). (Ilia,
   alexr at oplot dot com)

Added: php/php-src/branches/PHP_5_2/ext/zlib/tests/bug51269.phpt
===================================================================
--- php/php-src/branches/PHP_5_2/ext/zlib/tests/bug51269.phpt                   
        (rev 0)
+++ php/php-src/branches/PHP_5_2/ext/zlib/tests/bug51269.phpt   2010-03-11 
06:20:22 UTC (rev 296060)
@@ -0,0 +1,21 @@
+--TEST--
+Bug #51269 (zlib.output_compression Overwrites Vary Header)
+--INI--
+zlib.output_compression=1
+--ENV--
+HTTP_ACCEPT_ENCODING=gzip
+--SKIPIF--
+<?php
+if (!extension_loaded("zlib")) die("skip zlib required");
+?>
+--FILE--
+<?php
+header('Vary: Cookie');
+echo 'foo';
+?>
+--EXPECTF--
+%s
+--EXPECTHEADERS--
+Vary: Cookie
+Content-Encoding: gzip
+Vary: Accept-Encoding

Modified: php/php-src/branches/PHP_5_2/ext/zlib/zlib.c
===================================================================
--- php/php-src/branches/PHP_5_2/ext/zlib/zlib.c        2010-03-11 06:16:34 UTC 
(rev 296059)
+++ php/php-src/branches/PHP_5_2/ext/zlib/zlib.c        2010-03-11 06:20:22 UTC 
(rev 296060)
@@ -1004,7 +1004,7 @@
                                                
sapi_add_header_ex(ZEND_STRL("Content-Encoding: deflate"), 1, 1 TSRMLS_CC);
                                                break;
                                }
-                               sapi_add_header_ex(ZEND_STRL("Vary: 
Accept-Encoding"), 1, 1 TSRMLS_CC);
+                               sapi_add_header_ex(ZEND_STRL("Vary: 
Accept-Encoding"), 1, 0 TSRMLS_CC);
                        } else {
                                /* Disable compression if headers can not be 
set (Fix for bug #49816) */
                                ZLIBG(output_compression) = 0;

Modified: php/php-src/branches/PHP_5_3/NEWS
===================================================================
--- php/php-src/branches/PHP_5_3/NEWS   2010-03-11 06:16:34 UTC (rev 296059)
+++ php/php-src/branches/PHP_5_3/NEWS   2010-03-11 06:20:22 UTC (rev 296060)
@@ -6,6 +6,7 @@
 - Added stream filter support to mcrypt extension (ported from
   mcrypt_filter). (Stas)

+- Fixed bug #51269 (zlib.output_compression Overwrites Vary Header). (Adam)
 - Fixed bug #51257 (CURL_VERSION_LARGEFILE incorrectly used after libcurl
   version 7.10.1). (aron dot ujvari at microsec dot hu)
 - Fixed bug #51242 (Empty mysql.default_port does not default to 3306 anymore,

Added: php/php-src/branches/PHP_5_3/ext/zlib/tests/bug51269.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/zlib/tests/bug51269.phpt                   
        (rev 0)
+++ php/php-src/branches/PHP_5_3/ext/zlib/tests/bug51269.phpt   2010-03-11 
06:20:22 UTC (rev 296060)
@@ -0,0 +1,21 @@
+--TEST--
+Bug #51269 (zlib.output_compression Overwrites Vary Header)
+--INI--
+zlib.output_compression=1
+--ENV--
+HTTP_ACCEPT_ENCODING=gzip
+--SKIPIF--
+<?php
+if (!extension_loaded("zlib")) die("skip zlib required");
+?>
+--FILE--
+<?php
+header('Vary: Cookie');
+echo 'foo';
+?>
+--EXPECTF--
+%s
+--EXPECTHEADERS--
+Vary: Cookie
+Content-Encoding: gzip
+Vary: Accept-Encoding

Modified: php/php-src/branches/PHP_5_3/ext/zlib/zlib.c
===================================================================
--- php/php-src/branches/PHP_5_3/ext/zlib/zlib.c        2010-03-11 06:16:34 UTC 
(rev 296059)
+++ php/php-src/branches/PHP_5_3/ext/zlib/zlib.c        2010-03-11 06:20:22 UTC 
(rev 296060)
@@ -1056,7 +1056,7 @@
                                                
sapi_add_header_ex(ZEND_STRL("Content-Encoding: deflate"), 1, 1 TSRMLS_CC);
                                                break;
                                }
-                               sapi_add_header_ex(ZEND_STRL("Vary: 
Accept-Encoding"), 1, 1 TSRMLS_CC);
+                               sapi_add_header_ex(ZEND_STRL("Vary: 
Accept-Encoding"), 1, 0 TSRMLS_CC);
                        } else {
                                /* Disable compression if headers can not be 
set (Fix for bug #49816) */
                                ZLIBG(output_compression) = 0;

Added: php/php-src/trunk/ext/zlib/tests/bug51269.phpt
===================================================================
--- php/php-src/trunk/ext/zlib/tests/bug51269.phpt                              
(rev 0)
+++ php/php-src/trunk/ext/zlib/tests/bug51269.phpt      2010-03-11 06:20:22 UTC 
(rev 296060)
@@ -0,0 +1,21 @@
+--TEST--
+Bug #51269 (zlib.output_compression Overwrites Vary Header)
+--INI--
+zlib.output_compression=1
+--ENV--
+HTTP_ACCEPT_ENCODING=gzip
+--SKIPIF--
+<?php
+if (!extension_loaded("zlib")) die("skip zlib required");
+?>
+--FILE--
+<?php
+header('Vary: Cookie');
+echo 'foo';
+?>
+--EXPECTF--
+%s
+--EXPECTHEADERS--
+Vary: Cookie
+Content-Encoding: gzip
+Vary: Accept-Encoding

Modified: php/php-src/trunk/ext/zlib/zlib.c
===================================================================
--- php/php-src/trunk/ext/zlib/zlib.c   2010-03-11 06:16:34 UTC (rev 296059)
+++ php/php-src/trunk/ext/zlib/zlib.c   2010-03-11 06:20:22 UTC (rev 296060)
@@ -102,7 +102,7 @@
                        -Vary: $ HTTP_ACCEPT_ENCODING= ./sapi/cgi/php <<<'<?php 
ob_start("ob_gzhandler"); echo "foo\n"; ob_end_clean();'
                */
                if (output_context->op != 
(PHP_OUTPUT_HANDLER_START|PHP_OUTPUT_HANDLER_CLEAN|PHP_OUTPUT_HANDLER_FINAL)) {
-                       sapi_add_header_ex(ZEND_STRL("Vary: Accept-Encoding"), 
1, 1 TSRMLS_CC);
+                       sapi_add_header_ex(ZEND_STRL("Vary: Accept-Encoding"), 
1, 0 TSRMLS_CC);
                }
                return FAILURE;
        }
@@ -196,7 +196,7 @@
                                        deflateEnd(&ctx->Z);
                                        return FAILURE;
                        }
-                       sapi_add_header_ex(ZEND_STRL("Vary: Accept-Encoding"), 
1, 1 TSRMLS_CC);
+                       sapi_add_header_ex(ZEND_STRL("Vary: Accept-Encoding"), 
1, 0 TSRMLS_CC);
                        
php_output_handler_hook(PHP_OUTPUT_HANDLER_HOOK_IMMUTABLE, NULL TSRMLS_CC);
                }


-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to