- add note about SSL connect errors on windows due to LIB/DLL mismatches

[m6w6/ext-http] / config.w32

diff --git a/config.w32 b/config.w32
index 303af9f3833379871af90bdacd2398cd52bc7d1b..8822ef4fac041c9ce6126f7ce871fadfdb49f8db 100644 (file)
--- a/config.w32
+++ b/config.w32
@@ -17,6 +17,10 @@ if (PHP_HTTP != "no") {
                "/I\"" + configure_module_dirname + "/phpstr\"");
        ADD_SOURCES(configure_module_dirname + "/phpstr", "phpstr.c", "http");
        AC_DEFINE("HAVE_HTTP", 1, "Have extended HTTP support");
                "/I\"" + configure_module_dirname + "/phpstr\"");
        ADD_SOURCES(configure_module_dirname + "/phpstr", "phpstr.c", "http");
        AC_DEFINE("HAVE_HTTP", 1, "Have extended HTTP support");

+       
+       if (PHP_DEBUG != "no") {
+               ADD_FLAG("CFLAGS_HTTP", "/W3");
+       }

 
        MHASH_LIB = PHP_DEBUG != "no" ? "libmhash-staticd.lib":"libmhash-static.lib";
        if (CHECK_HEADER_ADD_INCLUDE('mhash.h', 'CFLAGS_HTTP') &&
 
        MHASH_LIB = PHP_DEBUG != "no" ? "libmhash-staticd.lib":"libmhash-static.lib";
        if (CHECK_HEADER_ADD_INCLUDE('mhash.h', 'CFLAGS_HTTP') &&


@@ -29,20 +33,24 @@ if (PHP_HTTP != "no") {
 
        CURL_LIB = PHP_DEBUG != "no" ? "libcurld.lib":"libcurl.lib";
     if (CHECK_HEADER_ADD_INCLUDE("curl/curl.h", "CFLAGS_HTTP") &&
 
        CURL_LIB = PHP_DEBUG != "no" ? "libcurld.lib":"libcurl.lib";
     if (CHECK_HEADER_ADD_INCLUDE("curl/curl.h", "CFLAGS_HTTP") &&

+               CHECK_HEADER_ADD_INCLUDE("openssl/crypto.h", "CFLAGS_HTTP") &&

                        CHECK_LIB(CURL_LIB, "http", PHP_HTTP) &&
                        CHECK_LIB(CURL_LIB, "http", PHP_HTTP) &&

-            CHECK_LIB("ssleay32.lib", "http", PHP_HTTP) &&
-            CHECK_LIB("libeay32.lib", "http", PHP_HTTP) &&
-            CHECK_LIB("zlib.lib", "http", PHP_HTTP) &&
-            CHECK_LIB("winmm.lib", "http", PHP_HTTP)) {
-        AC_DEFINE("HTTP_HAVE_CURL", 1, "Have CURL library");
-        AC_DEFINE("HAVE_CURL_MULTI_STRERROR", 1, "");
-        AC_DEFINE("HAVE_CURL_EASY_STRERROR", 1, "")
-    } else {
-        WARNING("curl convenience functions not enabled; libraries and headers not found");
-    }
-    
-    MAGIC_LIB = PHP_DEBUG != "no" ? "libmagic-staticd.lib":"libmagic-static.lib";
-    if (CHECK_HEADER_ADD_INCLUDE("magic.h", "CFLAGS_HTTP") &&
+                       CHECK_LIB("ssleay32.lib", "http", PHP_HTTP) &&
+                       CHECK_LIB("libeay32.lib", "http", PHP_HTTP) &&
+                       CHECK_LIB("zlib.lib", "http", PHP_HTTP) &&
+                       CHECK_LIB("winmm.lib", "http", PHP_HTTP)) {
+               AC_DEFINE("HTTP_HAVE_CURL", 1, "Have CURL library");
+               AC_DEFINE("HTTP_HAVE_SSL", 1, "Have SSL");
+               AC_DEFINE("HAVE_CURL_MULTI_STRERROR", 1, "");
+               AC_DEFINE("HAVE_CURL_EASY_STRERROR", 1, "");
+               AC_DEFINE("HAVE_CURL_EASY_RESET", 1, "");
+               AC_DEFINE("CURL_STATICLIB", 1, "");
+       } else {
+               WARNING("curl convenience functions not enabled; libraries and headers not found");
+       }
+
+       MAGIC_LIB = PHP_DEBUG != "no" ? "libmagic-staticd.lib":"libmagic-static.lib";
+       if (CHECK_HEADER_ADD_INCLUDE("magic.h", "CFLAGS_HTTP") &&

                        CHECK_LIB(MAGIC_LIB, "http", PHP_HTTP)) {
                AC_DEFINE("HTTP_HAVE_MAGIC", 1, "Have magic library");
                AC_DEFINE("USE_MAGIC_STATIC", "", "");
                        CHECK_LIB(MAGIC_LIB, "http", PHP_HTTP)) {
                AC_DEFINE("HTTP_HAVE_MAGIC", 1, "Have magic library");
                AC_DEFINE("USE_MAGIC_STATIC", "", "");