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

diff --combined includes/MediaWiki.php
index 55f9e9e,8f93778..ee03f02
--- 1/includes/MediaWiki.php
--- 2/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