X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=config.w32;h=13c24ab122f31a7ef203360e6af664c15fdc5317;hp=48b7b3a39c69b1bda545920bc31834dcfd833edb;hb=refs%2Fheads%2Fv2.4.x;hpb=2a501676c41f8b78392fdf4cd33e9eeaf46736f4

diff --git a/config.w32 b/config.w32
index 48b7b3a..13c24ab 100644
--- a/config.w32
+++ b/config.w32
@@ -46,23 +46,20 @@ function check_for_pecl_ext(ext, header)
 if (PHP_HTTP != "no") {
 
 	EXTENSION("http",
-		"php_http.c php_http_buffer.c php_http_client.c php_http_client_datashare.c php_http_client_factory.c " +
-		"php_http_client_interface.c php_http_client_pool.c php_http_client_request.c php_http_client_response.c " +
-		"php_http_cookie.c php_http_curl.c php_http_curl_client.c php_http_curl_client_datashare.c " +
-		"php_http_curl_client_pool.c php_http_encoding.c php_http_env.c php_http_env_request.c " +
+		"php_http.c php_http_buffer.c php_http_client.c " +
+		"php_http_client_request.c php_http_client_response.c " +
+		"php_http_cookie.c php_http_curl.c php_http_client_curl.c " +
+		"php_http_encoding.c php_http_env.c php_http_env_request.c " +
 		"php_http_env_response.c php_http_etag.c php_http_exception.c php_http_filter.c php_http_header_parser.c " +
-		"php_http_headers.c php_http_info.c php_http_message.c php_http_message_body.c php_http_message_parser.c " +
+		"php_http_header.c php_http_info.c php_http_message.c php_http_message_body.c php_http_message_parser.c " +
 		"php_http_misc.c php_http_negotiate.c php_http_object.c php_http_options.c php_http_params.c " +
-		"php_http_persistent_handle.c php_http_property_proxy.c php_http_querystring.c php_http_resource_factory.c " +
-		"php_http_strlist.c php_http_url.c php_http_version.c",
+		"php_http_querystring.c php_http_url.c php_http_version.c",
 		null,
 		null);
 	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");
@@ -95,6 +92,7 @@ if (PHP_HTTP != "no") {
 	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") &&
@@ -104,6 +102,8 @@ if (PHP_HTTP != "no") {
 			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("PHP_HTTP_HAVE_CURL", 1, "Have CURL library");
 		AC_DEFINE("PHP_HTTP_HAVE_SSL", 1, "Have SSL");
@@ -115,6 +115,16 @@ if (PHP_HTTP != "no") {
 		AC_DEFINE("PHP_HAVE_CURL_FORMGET", 1, "");
 		AC_DEFINE("PHP_HAVE_CURL_MULTI_SETOPT", 1, "");
 		AC_DEFINE("PHP_HAVE_CURL_MULTI_TIMEOUT", 1, "");
+
+		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");
 	}