- fix win32 build, really, for now

diff --git a/KnownIssues.txt b/KnownIssues.txt
index 41fa515e7bbe0d941f30a244ca94e368850a79ed..7fdda720801980f19c2ce236d46be64a47728043 100644 (file)
--- a/KnownIssues.txt
+++ b/KnownIssues.txt
@@ -18,8 +18,14 @@ generate any compressed data (gzip, deflate AKA zlib and raw deflate);
 just use the flag for the data format you want to generate:
        HTTP_DEFLATE_TYPE_GZIP, HTTP_DEFLATE_TYPE_ZLIB or HTTP_DEFLATE_TYPE_RAW.
 
+Windows:
+       There's no HttpUtil alias for http_build_query() due to missing export.
+
 Internals:
        -       there's a memleak with sizeof(zval) for each thrown exception, 
                which ends up in HttpRequestPoolExcepiont::$exceptionStack, in 
                HttpRequestPool::__construct(); it doesn't happen with wrapped
                exceptions in HttpRequestPool::send().
+
+       -       our http_urlencode_hash() only handles arrays and does not
+               differentiate between prefixes for numeric or string keys.
\ No newline at end of file

diff --git a/config.w32 b/config.w32
index ae73eae863e3f37e4af04bf6a1c0da61ccdfdacd..5411da120a9ff4d4c68d7c9f64ddd5c73cb84bc0 100644 (file)
--- a/config.w32
+++ b/config.w32
@@ -85,12 +85,10 @@ if (PHP_HTTP != "no") {
        if (PHP_SESSION != "no") {
                ADD_EXTENSION_DEP("http", "session", true);
        }
-       // for http_build_query()
-       ADD_EXTENSION_DEP("http", "standard");
 
        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) &&

diff --git a/http_util_object.c b/http_util_object.c
index d89cb996dfbf144142b40427808576f8abf860e4..6bda86dec0675f2763501beac0f1cca96152cce4 100644 (file)
--- a/http_util_object.c
+++ b/http_util_object.c
@@ -29,9 +29,11 @@ HTTP_BEGIN_ARGS(date, 0)
        HTTP_ARG_VAL(timestamp, 0)
 HTTP_END_ARGS;
 
+#ifndef PHP_WIN32
 HTTP_BEGIN_ARGS(buildQuery, 1)
        HTTP_ARG_VAL(query, 0)
 HTTP_END_ARGS;
+#endif
 
 HTTP_BEGIN_ARGS(buildUrl, 1)
        HTTP_ARG_VAL(url, 0)
@@ -104,7 +106,9 @@ zend_class_entry *http_util_object_ce;
 zend_function_entry http_util_object_fe[] = {
        HTTP_UTIL_ALIAS(date, http_date)
        HTTP_UTIL_ALIAS(buildUrl, http_build_url)
+#ifndef PHP_WIN32
        HTTP_UTIL_ALIAS(buildQuery, http_build_query)
+#endif
        HTTP_UTIL_ALIAS(negotiateLanguage, http_negotiate_language)
        HTTP_UTIL_ALIAS(negotiateCharset, http_negotiate_charset)
        HTTP_UTIL_ALIAS(negotiateContentType, http_negotiate_content_type)

diff --git a/php_http_util_object.h b/php_http_util_object.h
index 4c263a2e7a9aafa571e1581ec26667f61ca190ab..929ad6bf3fb3c95bc0e7b190e8a77fda7e022f68 100644 (file)
--- a/php_http_util_object.h
+++ b/php_http_util_object.h
@@ -23,7 +23,9 @@ extern PHP_MINIT_FUNCTION(http_util_object);
 
 PHP_METHOD(HttpUtil, date);
 PHP_METHOD(HttpUtil, buildUrl);
+#ifndef PHP_WIN32
 PHP_METHOD(HttpUtil, buildQuery);
+#endif
 PHP_METHOD(HttpUtil, negotiateLanguage);
 PHP_METHOD(HttpUtil, negotiateCharset);
 PHP_METHOD(HttpUtil, negotiateContentType);