From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Wed, 13 Jan 2016 03:16:40 +0000 (+0000)
Subject: Merge "Use dedicated cookie for skipping CDN cache after initiating DB changes"
X-Git-Tag: 1.31.0-rc.0~8354
X-Git-Url: http://git.cyclocoop.org/%22%20.%20generer_url_ecrire%28%22articles_versions%22%2C%22id_article=%24id_article%22%29%20.%20%22?a=commitdiff_plain;h=052770c40b84e22ddd42ff5686e0aaf3b9131030;hp=84022083410088f9ed00433485a4b076fec79ab8;p=lhc%2Fweb%2Fwiklou.git

Merge "Use dedicated cookie for skipping CDN cache after initiating DB changes"
---

diff --git a/includes/MediaWiki.php b/includes/MediaWiki.php
index 11afa75977..6a57d3943a 100644
--- a/includes/MediaWiki.php
+++ b/includes/MediaWiki.php
@@ -567,7 +567,9 @@ class MediaWiki {
 		$request = $context->getRequest();
 		if ( $request->wasPosted() && $factory->hasOrMadeRecentMasterChanges() ) {
 			$expires = time() + $config->get( 'DataCenterUpdateStickTTL' );
-			$request->response()->setCookie( 'UseDC', 'master', $expires, array( 'prefix' => '' ) );
+			$options = array( 'prefix' => '' );
+			$request->response()->setCookie( 'UseDC', 'master', $expires, $options );
+			$request->response()->setCookie( 'UseCDNCache', 'false', $expires, $options );
 		}
 
 		// Avoid letting a few seconds of slave lag cause a month of stale data