Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Support also no,shared configure arg vals by default

diff --cc ext/openssl/config.w32
index 1f5fa39b8577a4ac50547ebd9b1b9b194235e7b6,c9608531b7d1527d747937a0a205c2e157249ea5..ade17d402a57429986f0639063eb9026de76ff16
--- 1/ext/openssl/config.w32
--- 2/ext/openssl/config.w32
+++ b/ext/openssl/config.w32
@@@ -1,25 -1,18 +1,25 @@@
  // $Id$
  // vim:ft=javascript
  
- ARG_WITH("openssl", "OpenSSL support", "no");
+ ARG_WITH("openssl", "OpenSSL support", "no,shared");
  
  if (PHP_OPENSSL != "no") {
 -      if (CHECK_LIB("ssleay32.lib", "openssl", PHP_OPENSSL) &&
 -                      CHECK_LIB("libeay32.lib", "openssl", PHP_OPENSSL) &&
 -                      CHECK_LIB("crypt32.lib", "openssl") &&
 -                      CHECK_HEADER_ADD_INCLUDE("openssl/ssl.h", "CFLAGS_OPENSSL")) {
 -              EXTENSION("openssl", "openssl.c xp_ssl.c");
 +      var ret = SETUP_OPENSSL("openssl", PHP_OPENSSL);
  
 +      if (ret > 0) {
 +              EXTENSION("openssl", "openssl.c xp_ssl.c");
                AC_DEFINE("HAVE_OPENSSL_EXT", PHP_OPENSSL_SHARED ? 0 : 1, "Have openssl");
                AC_DEFINE("HAVE_OPENSSL", 1);
 -              AC_DEFINE("HAVE_DSA_DEFAULT_METHOD", 1);
 +
 +              switch (ret) {
 +                      /* Openssl 1.0.x and lower */
 +                      case 1:
 +                              AC_DEFINE("HAVE_DSA_DEFAULT_METHOD", 1);
 +                              break;
 +                      /* Openssl 1.1.x */
 +                      case 2:
 +                              break;
 +              }
        }
  }
  

diff --cc win32/build/confutils.js
Simple merge