- ext/hash detection

[m6w6/ext-http] / http_url_api.c

diff --git a/http_url_api.c b/http_url_api.c
index aa0c1f37c835692631866bd1083565604c39a6d6..9c35a5c4a989f906191c929ad522cbf865429db6 100644 (file)
--- a/http_url_api.c
+++ b/http_url_api.c
@@ -90,7 +90,7 @@ PHP_HTTP_API char *_http_absolute_url_ex(
                furl.port = purl->port;
        } else if (strncmp(furl.scheme, "http", 4)) {
 #if defined(PHP_WIN32) || defined(HAVE_NETDB_H)
-               if (se = getservbyname(furl.scheme, "tcp")) {
+               if ((se = getservbyname(furl.scheme, "tcp"))) {
                        furl.port = se->s_port;
                }
 #endif
@@ -214,6 +214,7 @@ PHP_HTTP_API STATUS _http_urlencode_hash_recursive(HashTable *ht, phpstr *str, c
        uint len = 0;
        ulong idx = 0;
        zval **data = NULL;
+       HashPosition pos;
 
        if (!ht || !str) {
                http_error(HE_WARNING, HTTP_E_INVALID_PARAM, "Invalid parameters");
@@ -223,7 +224,7 @@ PHP_HTTP_API STATUS _http_urlencode_hash_recursive(HashTable *ht, phpstr *str, c
                return SUCCESS;
        }
        
-       FOREACH_HASH_KEYLENVAL(ht, key, len, idx, data) {
+       FOREACH_HASH_KEYLENVAL(pos, ht, key, len, idx, data) {
                char *encoded_key;
                int encoded_len;
                phpstr new_prefix;