From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Sat, 19 Mar 2016 16:27:43 +0000 (+0000)
Subject: Merge "Handle HTTPS when running jobs asynchronously"
X-Git-Tag: 1.31.0-rc.0~7560
X-Git-Url: http://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/pie.php?a=commitdiff_plain;h=b8fce54279c4bc169247697642d87a1c8426e6d3;hp=-c;p=lhc%2Fweb%2Fwiklou.git

Merge "Handle HTTPS when running jobs asynchronously"
---

b8fce54279c4bc169247697642d87a1c8426e6d3
diff --combined includes/MediaWiki.php
index edc5a95cb8,5b7e1517db..ad02e68bb5
--- a/includes/MediaWiki.php
+++ b/includes/MediaWiki.php
@@@ -246,13 -246,13 +246,13 @@@ class MediaWiki 
  		} elseif ( !$this->tryNormaliseRedirect( $title ) ) {
  			// Prevent information leak via Special:MyPage et al (T109724)
  			if ( $title->isSpecialPage() ) {
 -				$specialPage = SpecialPageFactory::getPage( $title->getDBKey() );
 +				$specialPage = SpecialPageFactory::getPage( $title->getDBkey() );
  				if ( $specialPage instanceof RedirectSpecialPage ) {
  					$specialPage->setContext( $this->context );
  					if ( $this->config->get( 'HideIdentifiableRedirects' )
  						&& $specialPage->personallyIdentifiableTarget()
  					) {
 -						list( , $subpage ) = SpecialPageFactory::resolveAlias( $title->getDBKey() );
 +						list( , $subpage ) = SpecialPageFactory::resolveAlias( $title->getDBkey() );
  						$target = $specialPage->getRedirect( $subpage );
  						// target can also be true. We let that case fall through to normal processing.
  						if ( $target instanceof Title ) {
@@@ -830,9 -830,18 +830,18 @@@
  		$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