From a65bef626baf002bd32a6768824a45f72726471c Mon Sep 17 00:00:00 2001 From: Cindy Cicalese Date: Mon, 14 Mar 2016 12:04:40 -0400 Subject: [PATCH] Handle HTTPS when running jobs asynchronously Bug: T107290 Change-Id: Ie9af0e38c44c4097f25e701fc6a9a47a00f25d88 --- includes/MediaWiki.php | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) 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 -- 2.20.1