X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=http_url_api.c;h=db4ca96fd7abe76a47fdca84c9473eddcaa44845;hb=a343fa32a9cfa77208c68bd8f73338b6f03a2f56;hp=517ee1aef43b924e8c0351ded1ce576f2da94c1c;hpb=32e91737086db53bb1fd9ed9f79d693c43ec459f;p=m6w6%2Fext-http

diff --git a/http_url_api.c b/http_url_api.c
index 517ee1a..db4ca96 100644
--- a/http_url_api.c
+++ b/http_url_api.c
@@ -12,14 +12,10 @@
 
 /* $Id$ */
 
-#ifdef HAVE_CONFIG_H
-#	include "config.h"
-#endif
-
+#define HTTP_WANT_SAPI
 #define HTTP_WANT_NETDB
 #include "php_http.h"
 
-#include "SAPI.h"
 #include "zend_ini.h"
 #include "php_output.h"
 #include "ext/standard/php_string.h"
@@ -47,7 +43,7 @@ PHP_HTTP_API char *_http_absolute_url(const char *url TSRMLS_DC)
 /* {{{ void http_build_url(const php_url *, const php_url *, php_url **, char **, size_t *) */
 PHP_HTTP_API void _http_build_url(const php_url *old_url, const php_url *new_url, php_url **url_ptr, char **url_str, size_t *url_len TSRMLS_DC)
 {
-#if defined(PHP_WIN32) || defined(HAVE_NETDB_H)
+#ifdef HTTP_HAVE_NETDB
 	struct servent *se;
 #endif
 	php_url *url = emalloc(sizeof(php_url));
@@ -70,14 +66,14 @@ PHP_HTTP_API void _http_build_url(const php_url *old_url, const php_url *new_url
 				url->scheme = estrndup("https", lenof("https"));
 			break;
 
-#if !defined(PHP_WIN32) && !defined(HAVE_NETDB_H)
+#ifndef HTTP_HAVE_NETDB
 			default:
 #endif
 			case 80:
 				url->scheme = estrndup("http", lenof("http"));
 			break;
 			
-#if defined(PHP_WIN32) || defined(HAVE_NETDB_H)
+#ifdef HTTP_HAVE_NETDB
 			default:
 				if ((se = getservbyport(htons(url->port), "tcp")) && se->s_name) {
 					url->scheme = estrdup(se->s_name);
@@ -139,7 +135,7 @@ PHP_HTTP_API void _http_build_url(const php_url *old_url, const php_url *new_url
 	if (url->port) {
 		if (	((url->port == 80) && !strcmp(url->scheme, "http"))
 			||	((url->port ==443) && !strcmp(url->scheme, "https"))
-#if defined(PHP_WIN32) || defined(HAVE_NETDB_H)
+#ifdef HTTP_HAVE_NETDB
 			||	((se = getservbyname(url->scheme, "tcp")) && se->s_port && 
 					(url->port == ntohs(se->s_port)))
 #endif