diff options
| author | root <root@luna.archlinux.org> | 2016-05-21 06:38:45 +0000 |
|---|---|---|
| committer | root <root@luna.archlinux.org> | 2016-05-21 06:38:45 +0000 |
| commit | b88e92b7f0ce508c55de8c6ac5159ef544d480be (patch) | |
| tree | 86b188507543d2670b7ada1caa8f1139d3d5abe9 /includes/MediaWiki.php | |
| parent | a2bbd243c85ea0e425ee3e8c380aba9f254cee61 (diff) | |
| parent | 7bf2eb8ba09b54cec804446ea39a3e658773fac9 (diff) | |
Merge branch 'master' of https://git.archlinux.org/vhosts/wiki.archlinux.org
Diffstat (limited to 'includes/MediaWiki.php')
| -rw-r--r-- | includes/MediaWiki.php | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/includes/MediaWiki.php b/includes/MediaWiki.php index 2da2f6ce..a902f367 100644 --- a/includes/MediaWiki.php +++ b/includes/MediaWiki.php @@ -806,9 +806,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 |