coverity fixes
[m6w6/ext-http] / config.w32
index 680d7fa24eb745306c41ced159e5cfdb68df95c0..7b6366499d94b49b833061a719d7fe9a70f55c25 100644 (file)
@@ -11,7 +11,7 @@ function check_for_main_ext(ext, header)
 
        /* When in configure, we're always in the root of PHP source */
        var ext_path = "ext\\" + ext;
-       
+
        STDOUT.Write("Checking for ext/"+ ext +" ...  ");
 
        if (FSO.FileExists(ext_path + "\\" + header)) {
@@ -28,10 +28,10 @@ function check_for_pecl_ext(ext, header)
        if (!header) {
                header = "php_"+ ext +".h";
        }
-       
+
        var g;
        var s = ext +"\\"+ header;
-       
+
        STDOUT.Write("Checking for pecl/"+ ext +" ...  ");
        if (    (g = glob(configure_module_dirname +"\\..\\"+ s)) ||
                        (g = glob(configure_module_dirname +"\\..\\..\\..\\pecl\\"+ s))) {
@@ -45,56 +45,53 @@ function check_for_pecl_ext(ext, header)
 
 if (PHP_HTTP != "no") {
 
-       EXTENSION("http",
-               "missing.c http.c http_functions.c http_exception_object.c "+
-               "http_util_object.c http_message_object.c http_requestpool_object.c "+
-               "http_request_object.c http_response_object.c "+
-               "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_encoding_api.c "+
-               "http_filter_api.c http_request_body_api.c http_querystring_object.c "+
-               "http_deflatestream_object.c http_inflatestream_object.c "+
-               "http_cookie_api.c http_querystring_api.c http_request_datashare_api.c "+
-               "http_requestdatashare_object.c http_request_info.c http_persistent_handle_api.c",
-               null,
-               "/I\"" + configure_module_dirname + "/phpstr\"");
-       ADD_SOURCES(configure_module_dirname + "/phpstr", "phpstr.c", "http");
+       var PHP_HTTP_SRC_ARRAY = glob(configure_module_dirname + "/src/*.c");
+       var PHP_HTTP_SOURCES="";
+       for (var i=0; i<PHP_HTTP_SRC_ARRAY.length; ++i) {
+               var basename = FSO.GetFileName(PHP_HTTP_SRC_ARRAY[i]);
+               PHP_HTTP_SOURCES = PHP_HTTP_SOURCES + " " + basename;
+       }
+       //EXTENSION("http");
+       ADD_SOURCES(configure_module_dirname + "/src", PHP_HTTP_SOURCES, "http");
+       EXTENSION("http", "src/php_http.c");
        AC_DEFINE("HAVE_HTTP", 1, "Have extended HTTP support");
        AC_DEFINE("HTTP_SHARED_DEPS", 1, "Depend on shared extensions");
-       
+
        AC_DEFINE("HAVE_GETHOSTNAME", 1);
-       AC_DEFINE("HAVE_GETSERVBYPORT", 1);
-       AC_DEFINE("HAVE_GETSERVBYNAME", 1);
-       
+
        if (PHP_DEBUG != "no") {
                ADD_FLAG("CFLAGS_HTTP", "/W3");
        }
-       
+
        if (CHECK_HEADER_ADD_INCLUDE('zlib.h', 'CFLAGS_HTTP', '..\\zlib;' + php_usual_include_suspects)) {
                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");
        }
-       
+
        if (typeof(PHP_HASH) != "undefined" && PHP_HASH != "no") {
                var f;
-               
+
                if ((f = check_for_pecl_ext("hash")) || (f = check_for_main_ext("hash"))) {
                        ADD_FLAG("CFLAGS_HTTP", '/I "' + f + '" /DHTTP_HAVE_PHP_HASH_H=1');
                        ADD_EXTENSION_DEP("http", "hash", true);
                }
        }
-       
+
        if (PHP_SESSION != "no") {
                ADD_EXTENSION_DEP("http", "session", true);
        }
-       
+
        if (PHP_ICONV != "no") {
                ADD_EXTENSION_DEP("http", "iconv", true);
        }
-       
+
+       if (PHP_CURL != "no") {
+               ADD_EXTENSION_DEP("http", "curl", true);
+       }
+
+
        CURL_LIB="libcurl_a.lib;libcurl.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") &&
@@ -102,28 +99,33 @@ if (PHP_HTTP != "no") {
                        CHECK_LIB("ssleay32.lib", "http", PHP_HTTP) &&
                        CHECK_LIB("libeay32.lib", "http", PHP_HTTP) &&
                        CHECK_LIB("zlib.lib;zlib_a.lib", "http", PHP_HTTP) &&
+                       CHECK_LIB("libcurl_a.lib", "http", PHP_HTTP) &&
+                       ADD_EXTENSION_DEP("http", "propro", true) &&
+                       ADD_EXTENSION_DEP("http", "raphf", true) &&
                        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_SHARE_STRERROR", 1, "");
-               AC_DEFINE("HAVE_CURL_EASY_STRERROR", 1, "");
-               AC_DEFINE("HAVE_CURL_EASY_RESET", 1, "");
-               AC_DEFINE("HAVE_CURL_GETFORMDATA", 1, "");
-               AC_DEFINE("HAVE_CURL_FORMGET", 1, "");
-               AC_DEFINE("HAVE_CURL_MULTI_SETOPT", 1, "");
-               AC_DEFINE("HAVE_CURL_MULTI_TIMEOUT", 1, "");
+               AC_DEFINE("PHP_HTTP_HAVE_CURL", 1, "Have CURL library");
+               AC_DEFINE("PHP_HTTP_HAVE_SSL", 1, "Have SSL");
+               AC_DEFINE("PHP_HAVE_CURL_MULTI_STRERROR", 1, "");
+               AC_DEFINE("PHP_HAVE_CURL_SHARE_STRERROR", 1, "");
+               AC_DEFINE("PHP_HAVE_CURL_EASY_STRERROR", 1, "");
+               AC_DEFINE("PHP_HAVE_CURL_EASY_RESET", 1, "");
+               AC_DEFINE("PHP_HAVE_CURL_GETFORMDATA", 1, "");
+               AC_DEFINE("PHP_HAVE_CURL_FORMGET", 1, "");
+               AC_DEFINE("PHP_HAVE_CURL_MULTI_SETOPT", 1, "");
+               AC_DEFINE("PHP_HAVE_CURL_MULTI_TIMEOUT", 1, "");
+               AC_DEFINE("PHP_HTTP_HAVE_CLIENT", 1, "Have HTTP client support");
+               ADD_FLAG("CFLAGS_HTTP", "/I" + configure_module_dirname + " ");
+
+               if (CHECK_HEADER_ADD_INCLUDE("event2/event.h", "CFLAGS_HTTP") &&
+                       CHECK_LIB("libevent.lib", "http", PHP_HTTP) &&
+                       CHECK_LIB("libevent_core.lib", "http", PHP_HTTP) &&
+                       CHECK_LIB("libevent_extras.lib", "http", PHP_HTTP)) {
+
+                       AC_DEFINE("PHP_HTTP_HAVE_EVENT", 1);
+                       AC_DEFINE("PHP_HTTP_HAVE_EVENT2", 1);
+                       AC_DEFINE("PHP_HTTP_EVENT_VERSION", "2.0.21 or greater");
+               }
        } 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", "", "");
-//     } else {
-//             WARNING("content type guessing not enabled; libraries and headers not found");
-//     }
-*/
 }