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

diff --combined includes/MediaWiki.php
index 11afa75,c00be95..6a57d39
--- 1/includes/MediaWiki.php
--- 2/includes/MediaWiki.php
+++ b/includes/MediaWiki.php
@@@ -567,7 -567,9 +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
@@@ -664,10 -666,8 +666,10 @@@
                if (
                        $request->getProtocol() == 'http' &&
                        (
 +                              $request->getSession()->shouldForceHTTPS() ||
 +                              // Check the cookie manually, for paranoia
                                $request->getCookie( 'forceHTTPS', '' ) ||
 -                              // check for prefixed version for currently logged in users
 +                              // check for prefixed version that was used for a time in older MW versions
                                $request->getCookie( 'forceHTTPS' ) ||
                                // Avoid checking the user and groups unless it's enabled.
                                (