From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Tue, 31 May 2016 17:39:48 +0000 (+0000)
Subject: Merge "Do not redirect to HTTPS when it's not supported"
X-Git-Tag: 1.31.0-rc.0~6755
X-Git-Url: http://git.cyclocoop.org/%40spipnet%40?a=commitdiff_plain;h=2b61c4181d677c1da091744774a97a1ad7ccccf7;hp=-c;p=lhc%2Fweb%2Fwiklou.git

Merge "Do not redirect to HTTPS when it's not supported"
---

2b61c4181d677c1da091744774a97a1ad7ccccf7
diff --combined includes/MediaWiki.php
index 55f9e9ea8d,8f93778e23..ee03f020a8
--- a/includes/MediaWiki.php
+++ b/includes/MediaWiki.php
@@@ -667,10 -667,10 +667,10 @@@ class MediaWiki 
  		$trxLimits = $this->config->get( 'TrxProfilerLimits' );
  		$trxProfiler = Profiler::instance()->getTransactionProfiler();
  		$trxProfiler->setLogger( LoggerFactory::getInstance( 'DBPerformance' ) );
 -		if ( $request->wasPosted() ) {
 -			$trxProfiler->setExpectations( $trxLimits['POST'], __METHOD__ );
 -		} else {
 +		if ( $request->hasSafeMethod() ) {
  			$trxProfiler->setExpectations( $trxLimits['GET'], __METHOD__ );
 +		} else {
 +			$trxProfiler->setExpectations( $trxLimits['POST'], __METHOD__ );
  		}
  
  		// If the user has forceHTTPS set to true, or if the user
@@@ -680,6 -680,8 +680,8 @@@
  		// isLoggedIn() will do all sorts of weird stuff.
  		if (
  			$request->getProtocol() == 'http' &&
+ 			// switch to HTTPS only when supported by the server
+ 			preg_match( '#^https://#', wfExpandUrl( $request->getRequestURL(), PROTO_HTTPS ) ) &&
  			(
  				$request->getSession()->shouldForceHTTPS() ||
  				// Check the cookie manually, for paranoia