| Index: branches/REL1_18/phase3/includes/db/Database.php |
| — | — | @@ -1192,9 +1192,6 @@ |
| 1193 | 1193 | * - If the value is an array, an IN(...) clause will be constructed, |
| 1194 | 1194 | * such that the field name may match any of the elements in the |
| 1195 | 1195 | * array. The elements of the array will be quoted. |
| 1196 | | - * - If the field name ends with "!", this is taken as a flag which |
| 1197 | | - * inverts the comparison, allowing NOT IN clauses to be constructed, |
| 1198 | | - * for example: array( 'user_id!' => array( 1, 2, 3 ) ) |
| 1199 | 1196 | * |
| 1200 | 1197 | * Note that expressions are often DBMS-dependent in their syntax. |
| 1201 | 1198 | * DBMS-independent wrappers are provided for constructing several types of |
| Property changes on: branches/REL1_18/phase3/includes/db/Database.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 1202 | 1199 | Merged /trunk/phase3/includes/db/Database.php:r98703,98755,98880 |
| Index: branches/REL1_18/phase3/includes/Feed.php |
| — | — | @@ -239,13 +239,13 @@ |
| 240 | 240 | * but can also be called separately. |
| 241 | 241 | */ |
| 242 | 242 | public function httpHeaders() { |
| 243 | | - global $wgOut, $wgVaryOnXFPForAPI; |
| | 243 | + global $wgOut, $wgVaryOnXFP; |
| 244 | 244 | |
| 245 | 245 | # We take over from $wgOut, excepting its cache header info |
| 246 | 246 | $wgOut->disable(); |
| 247 | 247 | $mimetype = $this->contentType(); |
| 248 | 248 | header( "Content-type: $mimetype; charset=UTF-8" ); |
| 249 | | - if ( $wgVaryOnXFPForAPI ) { |
| | 249 | + if ( $wgVaryOnXFP ) { |
| 250 | 250 | $wgOut->addVaryHeader( 'X-Forwarded-Proto' ); |
| 251 | 251 | } |
| 252 | 252 | $wgOut->sendCacheControl(); |
| Index: branches/REL1_18/phase3/includes/OutputPage.php |
| — | — | @@ -1783,7 +1783,7 @@ |
| 1784 | 1784 | * the object, let's actually output it: |
| 1785 | 1785 | */ |
| 1786 | 1786 | public function output() { |
| 1787 | | - global $wgLanguageCode, $wgDebugRedirects, $wgMimeType; |
| | 1787 | + global $wgLanguageCode, $wgDebugRedirects, $wgMimeType, $wgVaryOnXFP; |
| 1788 | 1788 | |
| 1789 | 1789 | if( $this->mDoNothing ) { |
| 1790 | 1790 | return; |
| — | — | @@ -1803,6 +1803,9 @@ |
| 1804 | 1804 | } |
| 1805 | 1805 | $this->mLastModified = wfTimestamp( TS_RFC2822 ); |
| 1806 | 1806 | } |
| | 1807 | + if ( $wgVaryOnXFP ) { |
| | 1808 | + $this->addVaryHeader( 'X-Forwarded-Proto' ); |
| | 1809 | + } |
| 1807 | 1810 | $this->sendCacheControl(); |
| 1808 | 1811 | |
| 1809 | 1812 | $response->header( "Content-Type: text/html; charset=utf-8" ); |
| Property changes on: branches/REL1_18/phase3/includes/OutputPage.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 1810 | 1813 | Merged /trunk/phase3/includes/OutputPage.php:r98755,98880 |
| Index: branches/REL1_18/phase3/includes/api/ApiMain.php |
| — | — | @@ -399,7 +399,7 @@ |
| 400 | 400 | } |
| 401 | 401 | |
| 402 | 402 | protected function sendCacheHeaders() { |
| 403 | | - global $wgUseXVO, $wgOut, $wgVaryOnXFPForAPI; |
| | 403 | + global $wgUseXVO, $wgOut, $wgVaryOnXFP; |
| 404 | 404 | $response = $this->getRequest()->response(); |
| 405 | 405 | |
| 406 | 406 | if ( $this->mCacheMode == 'private' ) { |
| — | — | @@ -408,10 +408,10 @@ |
| 409 | 409 | } |
| 410 | 410 | |
| 411 | 411 | if ( $this->mCacheMode == 'anon-public-user-private' ) { |
| 412 | | - $xfp = $wgVaryOnXFPForAPI ? ', X-Forwarded-Proto' : ''; |
| | 412 | + $xfp = $wgVaryOnXFP ? ', X-Forwarded-Proto' : ''; |
| 413 | 413 | $response->header( 'Vary: Accept-Encoding, Cookie' . $xfp ); |
| 414 | 414 | if ( $wgUseXVO ) { |
| 415 | | - if ( $wgVaryOnXFPForAPI ) { |
| | 415 | + if ( $wgVaryOnXFP ) { |
| 416 | 416 | $wgOut->addVaryHeader( 'X-Forwarded-Proto' ); |
| 417 | 417 | } |
| 418 | 418 | $response->header( $wgOut->getXVO() ); |
| — | — | @@ -430,7 +430,7 @@ |
| 431 | 431 | } |
| 432 | 432 | |
| 433 | 433 | // Send public headers |
| 434 | | - if ( $wgVaryOnXFPForAPI ) { |
| | 434 | + if ( $wgVaryOnXFP ) { |
| 435 | 435 | $response->header( 'Vary: Accept-Encoding, X-Forwarded-Proto' ); |
| 436 | 436 | if ( $wgUseXVO ) { |
| 437 | 437 | // Bleeeeegh. Our header setting system sucks |
| Property changes on: branches/REL1_18/phase3/includes/api |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 438 | 438 | Merged /trunk/phase3/includes/api:r98755,98880 |
| Index: branches/REL1_18/phase3/includes/WikiPage.php |
| — | — | @@ -1068,7 +1068,7 @@ |
| 1069 | 1069 | $status = Status::newGood( array() ); |
| 1070 | 1070 | |
| 1071 | 1071 | # Load $this->mTitle->getArticleID() and $this->mLatest if it's not already |
| 1072 | | - $this->loadPageData(); |
| | 1072 | + $this->loadPageData( 'fromdbmaster' ); |
| 1073 | 1073 | |
| 1074 | 1074 | $flags = $this->checkFlags( $flags ); |
| 1075 | 1075 | |
| Index: branches/REL1_18/phase3/includes/DefaultSettings.php |
| — | — | @@ -1756,10 +1756,12 @@ |
| 1757 | 1757 | |
| 1758 | 1758 | /** Add X-Forwarded-Proto to the Vary and X-Vary-Options headers for API |
| 1759 | 1759 | * requests and RSS/Atom feeds. Use this if you have an SSL termination setup |
| 1760 | | - * and need to split the cache between HTTP and HTTPS for API and feed requests |
| 1761 | | - * in order to prevent cache pollution. This does not affect 'normal' requests. |
| | 1760 | + * and need to split the cache between HTTP and HTTPS for API requests, |
| | 1761 | + * feed requests and HTTP redirect responses in order to prevent cache |
| | 1762 | + * pollution. This does not affect 'normal' requests to index.php other than |
| | 1763 | + * HTTP redirects. |
| 1762 | 1764 | */ |
| 1763 | | -$wgVaryOnXFPForAPI = false; |
| | 1765 | +$wgVaryOnXFP = false; |
| 1764 | 1766 | |
| 1765 | 1767 | /** |
| 1766 | 1768 | * Internal server name as known to Squid, if different. Example: |
| Property changes on: branches/REL1_18/phase3/includes |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 1767 | 1769 | Merged /trunk/phase3/includes:r98703,98755,98880 |
| Property changes on: branches/REL1_18/phase3 |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 1768 | 1770 | Merged /trunk/phase3:r98703,98755,98880 |