X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=config.w32;h=e7f265db6beb95c3310fa10cfbbb1be426a4cf1f;hp=5411da120a9ff4d4c68d7c9f64ddd5c73cb84bc0;hb=f94c237788db6949e7ea63f360ad45412de50267;hpb=1c418a9e67b6b002fb0fa0616842cf92a54a108c

diff --git a/config.w32 b/config.w32
index 5411da1..e7f265d 100644
--- a/config.w32
+++ b/config.w32
@@ -8,18 +8,17 @@ function check_for_main_ext(ext, header)
 	if (!header) {
 		header = "php_"+ ext +".h";
 	}
-	
-	var r = new RegExp(PHP_VERSION +"."+ PHP_MINOR_VERSION);
-	var g = glob(configure_module_dirname +"\\..\\..\\*\\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 +" ...  ");
-	for (i = 0; i < g.length; i++) {
-		if (g[i].match(r)) {
-			var f = g[i].substr(0, g[i].length - header.length - 1);
-			STDOUT.WriteLine(f);
-			return f;
-		}
+
+	if (FSO.FileExists(ext_path + "\\" + header)) {
+		STDOUT.WriteLine(ext_path);
+		return ext_path;
 	}
+
 	STDOUT.WriteLine("<not found>");
 	return false;
 }
@@ -29,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))) {
@@ -46,69 +45,115 @@ 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",
-		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);
+
 	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");
+		AC_DEFINE('PHP_HTTP_HAVE_ZLIB', 1, "");
 		ADD_FLAG("LDFLAGS_HTTP", "/FORCE:MULTIPLE");
 	} else {
 		WARNING("zlib encoding functions not enabled; libraries and headers not found");
 	}
-	
-	if (PHP_HASH != "no") {
+
+	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);
-			AC_DEFINE("HTTP_HAVE_EXT_HASH", 1, "");
+			AC_DEFINE("PHP_HTTP_HAVE_EXT_HASH", 1, "");
+			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);
 	}
 
-	CURL_LIB = PHP_DEBUG != "no" ? "libcurld.lib":"libcurl.lib";
+	if (PHP_ICONV != "no") {
+		AC_DEFINE("PHP_HTTP_HAVE_EXT_ICONV", 1, "");
+		ADD_EXTENSION_DEP("http", "iconv", true);
+	}
+
+	if (PHP_INTL != "no") {
+		ADD_EXTENSION_DEP("http", "intl", true);
+		AC_DEFINE("HAVE_IDNA2008", 1, "");
+		AC_DEFINE("HAVE_UIDNA_IDNTOASCII", 1, "");
+		AC_DEFINE("HAVE_UIDNA_NAMETOASCII_UTF8", 1, "");
+		AC_DEFINE("PHP_HTTP_HAVE_LIBICU", 1, "");
+		AC_DEFINE("PHP_HTTP_HAVE_IDNA2003", 1, "");
+		AC_DEFINE("PHP_HTTP_HAVE_IDNA2008", 1, "");
+		ADD_FLAG("LIBS_HTTP", "icuuc.lib icudt.lib icuin.lib icuio.lib");
+		/* Compat for ICU before 58.1.*/
+		if (CHECK_LIB("icule.lib", "http", PHP_HTTP)) {
+			ADD_FLAG("LIBS_HTTP", "icule.lib");
+		}
+		if (CHECK_LIB("iculx.lib", "http", PHP_HTTP)) {
+			ADD_FLAG("LIBS_HTTP", "iculx.lib");
+		}
+	}
+
+	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") &&
 			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("wldap32.lib", "http", PHP_HTTP) &&
+			CHECK_LIB("libssh2.lib;libssh2_a.lib", "http", PHP_HTTP) &&
+			CHECK_LIB("nghttp2.lib;nghttp2_a.lib", "http", PHP_HTTP) &&
+			CHECK_LIB("normaliz.lib", "http", PHP_HTTP) &&
+			CHECK_LIB("libssl.lib;ssleay32.lib", "http", PHP_HTTP) &&
+			CHECK_LIB("libcrypto.lib;libeay32.lib", "http", PHP_HTTP) &&
+			CHECK_LIB("zlib.lib;zlib_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_EASY_STRERROR", 1, "");
-		AC_DEFINE("HAVE_CURL_EASY_RESET", 1, "");
-	} else {
-		WARNING("curl convenience functions not enabled; libraries and headers not found");
-	}
+		AC_DEFINE("PHP_HTTP_HAVE_LIBCURL", 1, "Have CURL library");
+		AC_DEFINE("PHP_HTTP_HAVE_SSL", 1, "Have SSL");
+		AC_DEFINE("PHP_HTTP_HAVE_LIBCURL_SSL", 1);
+		AC_DEFINE("PHP_HTTP_HAVE_LIBCURL_OPENSSL", 1);
+		AC_DEFINE("PHP_HTTP_HAVE_EXT_PROPRO", 1, "");
+		AC_DEFINE("PHP_HTTP_HAVE_EXT_RAPHF", 1, "");
+		AC_DEFINE("PHP_HTTP_HAVE_CLIENT", 1, "Have HTTP client support");
+		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, "");
+ 		ADD_FLAG("CFLAGS_HTTP", "/I" + configure_module_dirname + " ");
 
-	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", "", "");
+		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_LIBEVENT", 1);
+			AC_DEFINE("PHP_HTTP_HAVE_LIBEVENT2", 1);
+			AC_DEFINE("PHP_HTTP_LIBEVENT_VERSION", "2.0.21 or greater");
+		}
 	} else {
-		WARNING("content type guessing not enabled; libraries and headers not found");
+		WARNING("curl convenience functions not enabled; libraries and headers not found");
 	}
 }