From: Cindy Cicalese <cicalese@mitre.org>
Date: Mon, 14 Mar 2016 16:04:40 +0000 (-0400)
Subject: Handle HTTPS when running jobs asynchronously
X-Git-Tag: 1.31.0-rc.0~7560^2
X-Git-Url: https://git.cyclocoop.org/%27.WWW_URL.%27admin/?a=commitdiff_plain;h=a65bef626baf002bd32a6768824a45f72726471c;p=lhc%2Fweb%2Fwiklou.git

Handle HTTPS when running jobs asynchronously

Bug: T107290
Change-Id: Ie9af0e38c44c4097f25e701fc6a9a47a00f25d88
---

diff --git a/includes/MediaWiki.php b/includes/MediaWiki.php
index 45a13853e4..5b7e1517db 100644
--- a/includes/MediaWiki.php
+++ b/includes/MediaWiki.php
@@ -830,9 +830,18 @@ class MediaWiki {
 		$errno = $errstr = null;
 		$info = wfParseUrl( $this->config->get( 'Server' ) );
 		MediaWiki\suppressWarnings();
+		$host = $info['host'];
+		$port = 80;
+		if ( isset( $info['scheme'] ) && $info['scheme'] == 'https' ) {
+			$host = "tls://" . $host;
+			$port = 443;
+		}
+		if ( isset( $info['port'] ) ) {
+			$port = $info['port'];
+		}
 		$sock = fsockopen(
-			$info['host'],
-			isset( $info['port'] ) ? $info['port'] : 80,
+			$host,
+			$port,
 			$errno,
 			$errstr,
 			// If it takes more than 100ms to connect to ourselves there