- release 0.19.0

[m6w6/ext-http] / http_url_api.c

diff --git a/http_url_api.c b/http_url_api.c
index dd7066085d514e010937b7b88d5fa5d1b67f21bb..3fbf008e5329dfe63ac4e23f4086051be5e22f9e 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);
 
@@ -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