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

diff --git a/http_url_api.c b/http_url_api.c
index aa0c1f3..d4f10e9 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);
 
@@ -77,7 +69,7 @@ PHP_HTTP_API char *_http_absolute_url_ex(
 	} else if (purl->scheme) {
 		furl.scheme = purl->scheme;
 #if defined(PHP_WIN32) || defined(HAVE_NETDB_H)
-	} else if (port && (se = getservbyport(port, "tcp"))) {
+	} else if (port && (se = getservbyport(htons(port), "tcp"))) {
 		furl.scheme = (scheme = estrdup(se->s_name));
 #endif
 	} else {
@@ -90,15 +82,15 @@ 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")) {
-			furl.port = se->s_port;
+		if ((se = getservbyname(furl.scheme, "tcp"))) {
+			furl.port = ntohs(se->s_port);
 		}
 #endif
 	} else {
 		furl.port = (furl.scheme[4] == 's') ? 443 : 80;
 	}
 
-	if (host) {
+	if (host && host_len) {
 		furl.host = (char *) host;
 	} else if (purl->host) {
 		furl.host = purl->host;
@@ -142,7 +134,11 @@ PHP_HTTP_API char *_http_absolute_url_ex(
 	HTTP_URI_STRLCATL(URL, full_len, furl.host);
 
 	if (	(!strcmp(furl.scheme, "http") && (furl.port != 80)) ||
-			(!strcmp(furl.scheme, "https") && (furl.port != 443))) {
+			(!strcmp(furl.scheme, "https") && (furl.port != 443))
+#if defined(PHP_WIN32) || defined(HAVE_NETDB_H)
+		||	((!(se = getservbyname(furl.scheme, "tcp"))) || (ntohs(se->s_port) != furl.port))
+#endif
+		) {
 		char port_string[8] = {0};
 		snprintf(port_string, 7, ":%u", furl.port);
 		HTTP_URI_STRLCATL(URL, full_len, port_string);
@@ -214,6 +210,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 +220,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;