From: Michael Wallner <mike@php.net>
Date: Thu, 9 Sep 2010 12:49:13 +0000 (+0000)
Subject: include headers where they're actually needed
X-Git-Tag: DEV_2-before-client~131
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=34c5e92d16dbd185ca792bd889d9e6d27cdaac80;p=m6w6%2Fext-http

include headers where they're actually needed
---

diff --git a/php_http.h b/php_http.h
index 4dc9532..67e5262 100644
--- a/php_http.h
+++ b/php_http.h
@@ -64,11 +64,6 @@ typedef int STATUS;
 #	endif
 #endif
 
-#ifdef PHP_HTTP_HAVE_EVENT
-//#	include <event.h>
-#endif
-
-#include <curl/curl.h>
 #define PHP_HTTP_CURL_VERSION(x, y, z) (LIBCURL_VERSION_NUM >= (((x)<<16) + ((y)<<8) + (z)))
 
 #include <ctype.h>
diff --git a/php_http_message_parser.h b/php_http_message_parser.h
index 7d84fc2..ee6d022 100644
--- a/php_http_message_parser.h
+++ b/php_http_message_parser.h
@@ -15,7 +15,8 @@ typedef enum php_http_message_parser_state {
 	PHP_HTTP_MESSAGE_PARSER_STATE_DONE
 } php_http_message_parser_state_t;
 
-#define PHP_HTTP_MESSAGE_PARSER_CLEANUP 0x1
+#define PHP_HTTP_MESSAGE_PARSER_CLEANUP			0x1
+#define PHP_HTTP_MESSAGE_PARSER_EMPTY_REDIRECTS	0x2
 
 typedef struct php_http_message_parser {
 	php_http_header_parser_t header;
diff --git a/php_http_request_datashare.h b/php_http_request_datashare.h
index fdc4950..31e2a43 100644
--- a/php_http_request_datashare.h
+++ b/php_http_request_datashare.h
@@ -1,6 +1,8 @@
 #ifndef PHP_HTTP_REQUEST_DATASHARE_H
 #define PHP_HTTP_REQUEST_DATASHARE_H
 
+#include <curl/curl.h>
+
 #ifdef ZTS
 typedef struct php_http_request_datashare_lock {
 	CURL *ch;
diff --git a/php_http_request_pool.h b/php_http_request_pool.h
index f7cedb6..18d7243 100644
--- a/php_http_request_pool.h
+++ b/php_http_request_pool.h
@@ -2,6 +2,8 @@
 #ifndef PHP_HTTP_REQUESTPOOL_H
 #define PHP_HTTP_REQUESTPOOL_H
 
+#include <curl/curl.h>
+
 struct php_http_request_pool_globals {
 	void *event_base;
 };