X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_url_api.c;h=1cd5bd472d95a99f6b28878d425debed9f3bed2f;hp=fe1d834e7d6f58d966950ff11a5ff853f455202f;hb=246e63053d5a04be443015d71a52181da80054ac;hpb=0e0def98a4ea4463bf8c21c6f161b2b37aa8c49d

diff --git a/http_url_api.c b/http_url_api.c
index fe1d834..1cd5bd4 100644
--- a/http_url_api.c
+++ b/http_url_api.c
@@ -161,7 +161,7 @@ PHP_HTTP_API void _http_build_url(int flags, const php_url *old_url, const php_u
 	}
 	
 	if (!url->scheme) {
-		zval *https = http_get_server_var("HTTPS");
+		zval *https = http_get_server_var("HTTPS", 1);
 		if (https && !strcasecmp(Z_STRVAL_P(https), "ON")) {
 			url->scheme = estrndup("https", lenof("https"));
 		} else switch (url->port) {
@@ -191,8 +191,8 @@ PHP_HTTP_API void _http_build_url(int flags, const php_url *old_url, const php_u
 	if (!url->host) {
 		zval *zhost;
 		
-		if ((((zhost = http_get_server_var("HTTP_HOST")) || 
-				(zhost = http_get_server_var("SERVER_NAME")))) && Z_STRLEN_P(zhost)) {
+		if ((((zhost = http_get_server_var("HTTP_HOST", 1)) || 
+				(zhost = http_get_server_var("SERVER_NAME", 1)))) && Z_STRLEN_P(zhost)) {
 			url->host = estrndup(Z_STRVAL_P(zhost), Z_STRLEN_P(zhost));
 		} else {
 			url->host = localhostname();
@@ -306,9 +306,9 @@ PHP_HTTP_API void _http_build_url(int flags, const php_url *old_url, const php_u
 		strlcat(*url_str, url->host, HTTP_URL_MAXLEN);
 		
 		if (url->port) {
-			char port_str[8] = {0};
+			char port_str[8];
 			
-			snprintf(port_str, lenof(port_str), "%d", (int) url->port);
+			snprintf(port_str, sizeof(port_str), "%d", (int) url->port);
 			strlcat(*url_str, ":", HTTP_URL_MAXLEN);
 			strlcat(*url_str, port_str, HTTP_URL_MAXLEN);
 		}