- using Accept-Encoding header instead of CURLOPT_ENCODING avoids issues with curl...

[m6w6/ext-http] / http_url_api.c

diff --git a/http_url_api.c b/http_url_api.c
index 9c35a5c4a989f906191c929ad522cbf865429db6..4f20de5e847c1117d0cec3d4c830606b15f8cdb7 100644 (file)
--- 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);
 
@@ -59,13 +51,15 @@ PHP_HTTP_API char *_http_absolute_url_ex(
                return NULL;
        }
 
-       URL = ecalloc(1, HTTP_URI_MAXLEN + 1);
        uri = estrndup(url, url_len);
        if (!(purl = php_url_parse(uri))) {
+               efree(uri);
                http_error_ex(HE_WARNING, HTTP_E_URL, "Could not parse supplied URL: %s", url);
                return NULL;
        }
 
+       URL = ecalloc(1, HTTP_URI_MAXLEN + 1);
+
        furl.user               = purl->user;
        furl.pass               = purl->pass;
        furl.path               = purl->path;
@@ -77,7 +71,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((short) port), "tcp"))) {
                furl.scheme = (scheme = estrdup(se->s_name));
 #endif
        } else {
@@ -91,14 +85,15 @@ PHP_HTTP_API char *_http_absolute_url_ex(
        } 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;
+                       furl.port = ntohs(se->s_port);
                }
 #endif
+               furl.port = 0;
        } 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;
@@ -141,8 +136,13 @@ 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))) {
+       if (furl.port && (
+                       (!strcmp(furl.scheme, "http") && (furl.port != 80)) ||
+                       (!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);