X-Git-Url: https://git.cyclocoop.org/%242?a=blobdiff_plain;ds=sidebyside;f=includes%2FMediaWiki.php;h=21857b9e136c29c98aa74ab0cb2e3e8c7eaaa919;hb=d3d682fb45189c7437b6344c40b6024557bc06e0;hp=55f9e9ea8db7a1b6df650ce797bc715cc7f61164;hpb=b4ba5bbd79aaffa15a1e9ab6356a836cb94618af;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/MediaWiki.php b/includes/MediaWiki.php
index 55f9e9ea8d..21857b9e13 100644
--- a/includes/MediaWiki.php
+++ b/includes/MediaWiki.php
@@ -680,6 +680,8 @@ class MediaWiki {
 		// 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
@@ -762,9 +764,13 @@ class MediaWiki {
 		// Assure deferred updates are not in the main transaction
 		wfGetLBFactory()->commitMasterChanges( __METHOD__ );
 
-		// Ignore things like master queries/connections on GET requests
-		// as long as they are in deferred updates (which catch errors).
-		Profiler::instance()->getTransactionProfiler()->resetExpectations();
+		// Loosen DB query expectations since the HTTP client is unblocked
+		$trxProfiler = Profiler::instance()->getTransactionProfiler();
+		$trxProfiler->resetExpectations();
+		$trxProfiler->setExpectations(
+			$this->config->get( 'TrxProfilerLimits' )['PostSend'],
+			__METHOD__
+		);
 
 		// Do any deferred jobs
 		DeferredUpdates::doUpdates( 'enqueue' );