X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=http_api.c;h=a321350deeddda7fc7b6db1c735547eacf819308;hb=5f802478389681e57d231f4c19361f84c7005636;hp=adef9a2f8afad8c9370db2dcd8b8c11a0a87d41d;hpb=5f04760d51e4e25b55d12a4698b361e1e93f91a9;p=m6w6%2Fext-http

diff --git a/http_api.c b/http_api.c
index adef9a2..a321350 100644
--- a/http_api.c
+++ b/http_api.c
@@ -15,21 +15,14 @@
 
 /* $Id$ */
 
+#define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
+
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
 #include <ctype.h>
 
-#if defined(HAVE_CURL) && HAVE_CURL
-#	ifdef PHP_WIN32
-#	include <winsock2.h>
-#	include <sys/types.h>
-#	endif
-#include <curl/curl.h>
-#include <curl/easy.h>
-#endif
-
 #include "php.h"
 #include "php_version.h"
 #include "php_streams.h"
@@ -53,6 +46,18 @@
 #include "php_http.h"
 #include "php_http_api.h"
 
+#ifdef HTTP_HAVE_CURL
+
+#ifdef PHP_WIN32
+#include <winsock2.h>
+#include <sys/types.h>
+#endif
+
+#include <curl/curl.h>
+#include <curl/easy.h>
+#endif
+
+
 ZEND_DECLARE_MODULE_GLOBALS(http)
 
 /* {{{ day/month names */
@@ -140,7 +145,7 @@ static int check_month(char *month);
 static int check_tzone(char *tzone);
 
 /* {{{ HAVE_CURL */
-#if defined(HAVE_CURL) && HAVE_CURL
+#ifdef HTTP_HAVE_CURL
 #define http_curl_initbuf(m) _http_curl_initbuf((m) TSRMLS_CC)
 static inline void _http_curl_initbuf(http_curlbuf_member member TSRMLS_DC);
 #define http_curl_freebuf(m) _http_curl_freebuf((m) TSRMLS_CC)
@@ -295,7 +300,7 @@ static STATUS _http_send_chunk(const void *data, const size_t begin,
 /* }}} */
 
 /* {{{ HAVE_CURL */
-#if defined(HAVE_CURL) && HAVE_CURL
+#ifdef HTTP_HAVE_CURL
 
 /* {{{ static inline void http_curl_initbuf(http_curlbuf_member) */
 static inline void _http_curl_initbuf(http_curlbuf_member member TSRMLS_DC)
@@ -471,12 +476,9 @@ static inline void _http_curl_setopts(CURL *ch, const char *url, HashTable *opti
 	curl_easy_setopt(ch, CURLOPT_AUTOREFERER, 1);
 	curl_easy_setopt(ch, CURLOPT_WRITEFUNCTION, http_curl_body_callback);
 	curl_easy_setopt(ch, CURLOPT_HEADERFUNCTION, http_curl_hdrs_callback);
-#if defined(ZTS)
+#ifdef ZTS
 	curl_easy_setopt(ch, CURLOPT_NOSIGNAL, 1);
 #endif
-#if defined(PHP_DEBUG)
-	curl_easy_setopt(ch, CURLOPT_VERBOSE, 1);
-#endif
 
 	if ((!options) || (1 > zend_hash_num_elements(options))) {
 		return;
@@ -1083,12 +1085,6 @@ PHP_HTTP_API int _http_modified_match(const char *entry, const time_t t TSRMLS_D
 		chr_ptr = 0;
 	}
 	retval = (t <= http_parse_date(modified));
-#if defined(PHP_DEBUG)
-	fprintf(stderr,
-		"\nComparing Last-Modified %s(%s)==%d:\n\t%d\n\t%d\n\n",
-		get_active_function_name(TSRMLS_C), entry, retval, t,
-		http_parse_date(modified));
-#endif
 	efree(modified);
 	return retval;
 }
@@ -1115,12 +1111,6 @@ PHP_HTTP_API int _http_etag_match(const char *entry, const char *etag TSRMLS_DC)
 	} else {
 		result = (NULL != strstr(Z_STRVAL_P(zetag), quoted_etag));
 	}
-#if defined(PHP_DEBUG)
-	fprintf(stderr,
-		"\nComparing E-Tag %s(%s)==%d:\n\t<%s>\n\t<%s>\n\n",
-		get_active_function_name(TSRMLS_C), entry, result,
-		Z_STRVAL_P(zetag), quoted_etag);
-#endif
 	efree(quoted_etag);
 	return result;
 }
@@ -1744,7 +1734,7 @@ PHP_HTTP_API void _http_split_response(const zval *zresponse, zval *zheaders,
 /* }}} */
 
 /* {{{ HAVE_CURL */
-#if defined(HAVE_CURL) && HAVE_CURL
+#ifdef HTTP_HAVE_CURL
 
 /* {{{ STATUS http_get(char *, HashTable *, HashTable *, char **, size_t *) */
 PHP_HTTP_API STATUS _http_get(const char *URL, HashTable *options,