X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=config.w32;h=c82eca464f9848b4825a7273e072141e41c1b186;hp=2847a2c810a4098a515edf90f48fdaf7047cfcc8;hb=5773d11d8c9c28fb8b0e3389258f548fc4717892;hpb=16dba799dae126258bbb09e2f699d5d7954fac17

diff --git a/config.w32 b/config.w32
index 2847a2c..c82eca4 100644
--- a/config.w32
+++ b/config.w32
@@ -2,7 +2,6 @@
 // $Id$
 
 ARG_ENABLE("http", "whether to enable extended HTTP support", "no");
-ARG_ENABLE("http-stream-wrapper", "whether to enable experimental stream wrapper", "no", "no");
 
 function check_for_main_ext(ext, header)
 {
@@ -55,16 +54,14 @@ if (PHP_HTTP != "no") {
 		"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_wrapper_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",
 		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_HTTP_STREAM_WRAPPER == "yes") {
-		AC_DEFINE("HTTP_HAVE_WRAPPER", 1, "Have experimental HTTP stream wrapper");
-	}
-	
 	if (PHP_DEBUG != "no") {
 		ADD_FLAG("CFLAGS_HTTP", "/W3");
 	}
@@ -85,10 +82,18 @@ if (PHP_HTTP != "no") {
 			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);
+	}
+	
 	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") &&
+	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) &&