- added INI setting http.force_exit which can be used to disable script termination

[m6w6/ext-http] / config.w32

diff --git a/config.w32 b/config.w32
index 7abe09025b4433393d18ae9ad038fec425a76bf2..1cc13f5ec622804a9b51215adfa4d7b49fa8577f 100644 (file)
--- a/config.w32
+++ b/config.w32
@@ -12,11 +12,22 @@ if (PHP_HTTP != "no") {
                "http_api.c http_cache_api.c http_request_pool_api.c "+
                "http_request_api.c http_date_api.c http_headers_api.c "+
                "http_message_api.c http_send_api.c http_url_api.c "+
-               "http_info_api.c http_request_method_api.c",
+               "http_info_api.c http_request_method_api.c http_encoding_api.c",
                null,
                "/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");
+       }
+       
+       if (CHECK_HEADER_ADD_INCLUDE('zlib.h', 'CFLAGS_HTTP')) {
+               AC_DEFINE('HTTP_HAVE_ZLIB', 1, "Have zlib library");
+               ADD_FLAG("LDFLAGS_HTTP", "/FORCE:MULTIPLE");
+       } else {
+               WARNING("zlib encoding functions not enabled; libraries and headers not found");
+       }
 
        MHASH_LIB = PHP_DEBUG != "no" ? "libmhash-staticd.lib":"libmhash-static.lib";
        if (CHECK_HEADER_ADD_INCLUDE('mhash.h', 'CFLAGS_HTTP') &&
@@ -29,14 +40,18 @@ if (PHP_HTTP != "no") {
 
        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("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_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");
        }