X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=http_url_api.c;h=3fbf008e5329dfe63ac4e23f4086051be5e22f9e;hb=902522d8c8f5fc5b2c58cd32cea4bb099f16824c;hp=aa0c1f37c835692631866bd1083565604c39a6d6;hpb=0fba8595e6e2de88cad39460340d620a089c55ed;p=m6w6%2Fext-http

diff --git a/http_url_api.c b/http_url_api.c
index aa0c1f3..3fbf008 100644
--- a/http_url_api.c
+++ b/http_url_api.c
@@ -15,25 +15,17 @@
 #ifdef HAVE_CONFIG_H
 #	include "config.h"
 #endif
-#include "php.h"
+
+#define HTTP_WANT_NETDB
+#include "php_http.h"
 
 #include "SAPI.h"
 #include "zend_ini.h"
 #include "php_output.h"
 #include "ext/standard/url.h"
 
-#include "php_http.h"
 #include "php_http_api.h"
 #include "php_http_url_api.h"
-#include "php_http_std_defs.h"
-
-#include "phpstr/phpstr.h"
-
-#ifdef PHP_WIN32
-#	include <winsock2.h>
-#elif defined(HAVE_NETDB_H)
-#	include <netdb.h>
-#endif
 
 ZEND_EXTERN_MODULE_GLOBALS(http);
 
@@ -90,7 +82,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 +206,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 +216,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;