From e761c34103c0c5316cce092ea42a789b95e887d2 Mon Sep 17 00:00:00 2001 From: Michael Wallner Date: Wed, 15 Jun 2016 09:20:28 +0200 Subject: [PATCH 1/1] MFH header fixes --- src/php_http.c | 4 ++-- src/php_http_api.h | 22 ++++++++++++---------- src/php_http_buffer.c | 2 +- src/php_http_client.c | 2 +- src/php_http_etag.c | 6 +++--- src/php_http_exception.c | 2 +- src/php_http_message_body.c | 2 +- src/php_http_misc.c | 4 ++-- src/php_http_querystring.c | 6 +++--- src/php_http_url.h | 2 +- 10 files changed, 27 insertions(+), 25 deletions(-) diff --git a/src/php_http.c b/src/php_http.c index abb8377..cdd0287 100644 --- a/src/php_http.c +++ b/src/php_http.c @@ -12,8 +12,8 @@ #include "php_http_api.h" -#include -#include +#include "php_ini.h" +#include "ext/standard/info.h" #include diff --git a/src/php_http_api.h b/src/php_http_api.h index 08b6ba8..8c0b9be 100644 --- a/src/php_http_api.h +++ b/src/php_http_api.h @@ -18,19 +18,19 @@ #endif #ifndef PHP_WIN32 -#include +#include "php_config.h" #endif -#include -#include +#include "php.h" +#include "SAPI.h" -#include -#include -#include -#include -#include +#include "ext/raphf/php_raphf.h" +#include "ext/propro/php_propro.h" +#include "ext/standard/php_string.h" +#include "ext/spl/spl_iterators.h" +#include "ext/date/php_date.h" -#include -#include +#include "zend_interfaces.h" +#include "zend_exceptions.h" #ifdef PHP_WIN32 @@ -101,6 +101,8 @@ #include "php_http_client_request.h" #include "php_http_client_response.h" #include "php_http_client_curl.h" +#include "php_http_client_curl_event.h" +#include "php_http_client_curl_user.h" #include "php_http_url.h" #include "php_http_version.h" diff --git a/src/php_http_buffer.c b/src/php_http_buffer.c index e24a4e1..eaebfa0 100644 --- a/src/php_http_buffer.c +++ b/src/php_http_buffer.c @@ -10,7 +10,7 @@ +--------------------------------------------------------------------+ */ -#include +#include "php.h" #include "php_http_buffer.h" PHP_HTTP_BUFFER_API php_http_buffer_t *php_http_buffer_init_ex(php_http_buffer_t *buf, size_t chunk_size, int flags) diff --git a/src/php_http_client.c b/src/php_http_client.c index 160e8bb..0463b7a 100644 --- a/src/php_http_client.c +++ b/src/php_http_client.c @@ -13,7 +13,7 @@ #include "php_http_api.h" #include "php_http_client.h" -#include +#include "ext/spl/spl_observer.h" /* * array of name => php_http_client_driver_t* diff --git a/src/php_http_etag.c b/src/php_http_etag.c index 3604ad8..4e5fd69 100644 --- a/src/php_http_etag.c +++ b/src/php_http_etag.c @@ -16,9 +16,9 @@ # include "php_hash.h" #endif -#include -#include -#include +#include "ext/standard/crc32.h" +#include "ext/standard/sha1.h" +#include "ext/standard/md5.h" php_http_etag_t *php_http_etag_init(const char *mode TSRMLS_DC) { diff --git a/src/php_http_exception.c b/src/php_http_exception.c index 25a33e6..34146ad 100644 --- a/src/php_http_exception.c +++ b/src/php_http_exception.c @@ -12,7 +12,7 @@ #include "php_http_api.h" -#include +#include "ext/spl/spl_exceptions.h" #ifndef PHP_HTTP_DBG_EXCEPTIONS # define PHP_HTTP_DBG_EXCEPTIONS 0 diff --git a/src/php_http_message_body.c b/src/php_http_message_body.c index c80c238..82f790e 100644 --- a/src/php_http_message_body.c +++ b/src/php_http_message_body.c @@ -12,7 +12,7 @@ #include "php_http_api.h" -#include +#include "ext/standard/php_lcg.h" #define BOUNDARY_OPEN(body) \ do {\ diff --git a/src/php_http_misc.c b/src/php_http_misc.c index 8e2227d..9873ff8 100644 --- a/src/php_http_misc.c +++ b/src/php_http_misc.c @@ -12,8 +12,8 @@ #include "php_http_api.h" -#include -#include +#include "ext/standard/php_lcg.h" +#include "zend_exceptions.h" /* SLEEP */ diff --git a/src/php_http_querystring.c b/src/php_http_querystring.c index 322bd75..42f774e 100644 --- a/src/php_http_querystring.c +++ b/src/php_http_querystring.c @@ -12,15 +12,15 @@ #include "php_http_api.h" -#include -#include +#include "php_variables.h" +#include "ext/spl/spl_array.h" #ifdef PHP_HTTP_HAVE_ICONV # ifndef HAVE_ICONV # define HAVE_ICONV 1 # endif # undef PHP_ATOM_INC -# include +# include "ext/iconv/php_iconv.h" #endif #define QS_MERGE 1 diff --git a/src/php_http_url.h b/src/php_http_url.h index 636efb5..50c5a5c 100644 --- a/src/php_http_url.h +++ b/src/php_http_url.h @@ -13,7 +13,7 @@ #ifndef PHP_HTTP_URL_H #define PHP_HTTP_URL_H -#include +#include "ext/standard/url.h" /* php_http_url_mod() */ #define PHP_HTTP_URL_REPLACE 0x000 -- 2.30.2