From: Anatol Belski <ab@php.net>
Date: Wed, 14 Mar 2018 11:01:01 +0000 (+0100)
Subject: Merge branch 'PHP-7.1' into PHP-7.2
X-Git-Tag: php-7.2.5RC1~46
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1e31ac079bce62ed4fa3bd7f9a9d5d390ce76b1b;p=php

Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  Upgrade binary SDK version for AppVeyor
---

1e31ac079bce62ed4fa3bd7f9a9d5d390ce76b1b
diff --cc .appveyor.yml
index 9f6116885b,5d0ec71aaf..ed6ae6abb1
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@@ -23,8 -23,7 +23,8 @@@ environment
          PHP_BUILD_CACHE_BASE_DIR: c:\build-cache  
          PHP_BUILD_OBJ_DIR: c:\obj
          PHP_BUILD_CACHE_SDK_DIR: c:\build-cache\sdk
-         PHP_BUILD_SDK_BRANCH: php-sdk-2.1.1
+         PHP_BUILD_SDK_BRANCH: php-sdk-2.1.2
 +        PHP_BUILD_CRT: vc15
          # ext and env setup for tests
          #MYSQL_TEST_PASSWD: Password12!
          #MYSQL_TEST_USER: root