projects
/
m6w6
/
ext-http
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
- there's no php_memnstr in PHP-4
[m6w6/ext-http]
/
config.w32
diff --git
a/config.w32
b/config.w32
index 2847a2c810a4098a515edf90f48fdaf7047cfcc8..e0a8af83f8b8efe250e9d75c0566fe450c78ec68 100644
(file)
--- a/
config.w32
+++ b/
config.w32
@@
-2,7
+2,6
@@
// $Id$
ARG_ENABLE("http", "whether to enable extended HTTP support", "no");
// $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)
{
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_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",
null,
"/I\"" + configure_module_dirname + "/phpstr\"");
ADD_SOURCES(configure_module_dirname + "/phpstr", "phpstr.c", "http");
AC_DEFINE("HAVE_HTTP", 1, "Have extended HTTP support");
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");
}
if (PHP_DEBUG != "no") {
ADD_FLAG("CFLAGS_HTTP", "/W3");
}
@@
-85,10
+82,18
@@
if (PHP_HTTP != "no") {
ADD_EXTENSION_DEP("http", "hash", true);
}
}
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";
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) &&
CHECK_LIB(CURL_LIB, "http", PHP_HTTP) &&
CHECK_LIB("ssleay32.lib", "http", PHP_HTTP) &&
CHECK_LIB("libeay32.lib", "http", PHP_HTTP) &&