| Index: branches/REL1_16/phase3/includes/OutputHandler.php |
| — | — | @@ -90,7 +90,10 @@ |
| 91 | 91 | } |
| 92 | 92 | if ( !$foundVary ) { |
| 93 | 93 | header( 'Vary: Accept-Encoding' ); |
| 94 | | - header( 'X-Vary-Options: Accept-Encoding;list-contains=gzip' ); |
| | 94 | + global $wgUseXVO; |
| | 95 | + if ( $wgUseXVO ) { |
| | 96 | + header( 'X-Vary-Options: Accept-Encoding;list-contains=gzip' ); |
| | 97 | + } |
| 95 | 98 | } |
| 96 | 99 | return $s; |
| 97 | 100 | } |
| Property changes on: branches/REL1_16/phase3/includes/OutputHandler.php |
| ___________________________________________________________________ |
| Added: svn:mergeinfo |
| 98 | 101 | Merged /branches/sqlite/includes/OutputHandler.php:r58211-58321 |
| 99 | 102 | Merged /trunk/phase3/includes/OutputHandler.php:r63549,63764,63897-63901,64876,64881,64948,69770 |
| 100 | 103 | Merged /branches/wmf-deployment/includes/OutputHandler.php:r53381 |
| 101 | 104 | Merged /branches/REL1_15/phase3/includes/OutputHandler.php:r51646 |
| Index: branches/REL1_16/phase3/includes/OutputPage.php |
| — | — | @@ -1266,7 +1266,7 @@ |
| 1267 | 1267 | $cvCookies = $this->getCacheVaryCookies(); |
| 1268 | 1268 | foreach ( $cvCookies as $cookieName ) { |
| 1269 | 1269 | # Check for a simple string match, like the way squid does it |
| 1270 | | - if ( strpos( $cookieHeader, $cookieName ) ) { |
| | 1270 | + if ( strpos( $cookieHeader, $cookieName ) !== false ) { |
| 1271 | 1271 | wfDebug( __METHOD__.": found $cookieName\n" ); |
| 1272 | 1272 | return true; |
| 1273 | 1273 | } |
| Property changes on: branches/REL1_16/phase3/includes/OutputPage.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 1274 | 1274 | Merged /trunk/phase3/includes/OutputPage.php:r69771 |