Prepare 2.1.2

README.md

@@ -66,7 +66,7 @@ It is not required to hold the source in the PHP SDK directory. It could be usef
 - invoke `phpsdk-vc15-x64.bat`
 - `phpsdk_buildtree phpmaster`
 - `git clone https://github.com/php/php-src.git && cd php-src`, or fetch a zipball
-- `phpsdk_deps --update --branch master`, use PHP-X.Y for a non master branch
+- `phpsdk_deps --update --branch master`, use `phpsdk_deps --update --branch X.Y` for a non master branch
 - do the build, eg. `buildconf && configure --enable-cli && nmake`
 
 More extensive documentation can be found on the [wiki](https://wiki.php.net/internals/windows/stepbystepbuild_sdk_2 "PHP wiki page").

VERSION

@@ -1 +1 @@
-2.1.1
+2.1.2

lib/php/libsdk/SDK/Build/Dependency/Fetcher.php

@@ -15,12 +15,13 @@ class Fetcher
 	protected $series;
 
 
-	public function __construct(string $host, int $port, string $arch = NULL, string $stability = NULL, Series $series = NULL)
+	public function __construct(string $host, int $port, string $scheme = "https", string $arch = NULL, string $stability = NULL, Series $series = NULL)
 	{/*{{{*/
 		$this->stability = $stability;
 		$this->arch = $arch;
 		$this->host = $host;
 		$this->port = $port;
+		$this->scheme = $scheme;
 	}/*}}}*/
 
 	public function getSeries() : Series
@@ -37,7 +38,7 @@ class Fetcher
 	/* TODO implement indicator. */
 	public function getByUri(string $uri, int $retries = 3) : string
 	{/*{{{*/
-		$url = "http://{$this->host}:{$this->port}$uri";
+		$url = "{$this->scheme}://{$this->host}:{$this->port}$uri";
 		$ret = false;
 
 retry:

lib/php/libsdk/SDK/Build/Dependency/Manager.php

@@ -24,7 +24,8 @@ class Manager
 
 		$host = Config::getDepsHost();
 		$port = Config::getDepsPort();
-		$fetcher = new Fetcher($host, $port, $this->arch, $this->stability);
+		$scheme = Config::getDepsUriScheme();
+		$fetcher = new Fetcher($host, $port, $scheme, $this->arch, $this->stability);
 		$series = new Series($this->stability, $this->arch, $this->cache, NULL);
 		$fetcher->setSeries($series);
 		$series->setFetcher($fetcher);

lib/php/libsdk/SDK/Config.php

@@ -10,7 +10,8 @@ class Config
 {
 	/* Config variables. */
 	protected static $depsHost = 'windows.php.net';
-	protected static $depsPort = 80;
+	protected static $depsPort = 443;
+	protected static $depsUriScheme = "https";
 	protected static $depsBaseUri = "/downloads/php-sdk/deps";
 
 	/* protected static $sdkNugetFeedUrl = "http://127.0.0.1/sdk/nuget"; */
@@ -34,6 +35,11 @@ class Config
 		return self::$depsPort;
 	}/*}}}*/
 
+	public static function getDepsUriScheme() : string
+	{/*{{{*/
+		return self::$depsUriScheme;
+	}/*}}}*/
+
 	public static function getDepsBaseUri() : string
 	{/*{{{*/
 		return self::$depsBaseUri;
@@ -125,7 +131,7 @@ class Config
 		if (empty(self::$knownBranches)) {
 			$cache_file = "known_branches.txt";
 			$cache = new Cache(self::getDepsLocalPath());
-			$fetcher = new Fetcher(self::$depsHost, self::$depsPort);
+			$fetcher = new Fetcher(self::$depsHost, self::$depsPort, self::$depsUriScheme);
 
 			$tmp = $fetcher->getByUri(self::$depsBaseUri . "/series/");
 			if (false !== $tmp) {