include headers where they're actually needed

diff --git a/php_http.h b/php_http.h
index 4dc95327450cebe0152e3b02af1b018795f6318a..67e5262136bbfcd748d1ab3481bfb910d51b638c 100644 (file)
--- 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 7d84fc2ef1deef6cc82b5d3c42bd345b266d56ea..ee6d022829c7c59d611b0de9992db9cd66be4647 100644 (file)
--- 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 fdc495031bedd8f13f0c6a97522f3f646b1ab957..31e2a43b7ee445ee01b997323f65fd271e9c247b 100644 (file)
--- 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 f7cedb66e37cf2640ffc0d95149e9ae3b87149fd..18d724347f0d160840315758d9888b4e6ad33590 100644 (file)
--- 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;
 };