X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http.c;h=3b0588719324a8140363227e023e543f47552643;hp=9371e19a41c059b8e15be271e34f1de52bde9085;hb=64b8eb68455c36e7e153014deaf52a6f9d2de39c;hpb=2fd70a4002aeb4c60e3d593da224bbcd0bd6cac4 diff --git a/http.c b/http.c index 9371e19..3b05887 100644 --- a/http.c +++ b/http.c @@ -19,26 +19,17 @@ #ifdef HAVE_CONFIG_H # include "config.h" #endif - -#ifdef HTTP_HAVE_CURL -# ifdef PHP_WIN32 -# include -# endif -# include -#endif - -#include - #include "php.h" -#include "php_ini.h" -#include "ext/standard/info.h" #include "SAPI.h" +#include "php_ini.h" +#include "ext/standard/info.h" #include "php_http.h" #include "php_http_std_defs.h" #include "php_http_api.h" #include "php_http_send_api.h" +#include "php_http_request_api.h" #ifdef ZEND_ENGINE_2 # include "php_http_util_object.h" @@ -53,6 +44,15 @@ #include "phpstr/phpstr.h" +#ifdef HTTP_HAVE_CURL +# ifdef PHP_WIN32 +# include +# endif +# include +#endif + +#include + ZEND_DECLARE_MODULE_GLOBALS(http); HTTP_DECLARE_ARG_PASS_INFO(); @@ -84,6 +84,7 @@ function_entry http_functions[] = { PHP_FE(http_split_response, NULL) PHP_FE(http_parse_headers, NULL) PHP_FE(http_get_request_headers, NULL) + PHP_FE(http_get_request_body, NULL) PHP_FE(http_match_request_header, NULL) #ifdef HTTP_HAVE_CURL PHP_FE(http_get, http_arg_pass_ref_3) @@ -146,9 +147,11 @@ static inline void http_globals_free(zend_http_globals *G) STR_FREE(G->send.content_type); STR_FREE(G->send.unquoted_etag); zend_hash_destroy(&G->request.methods.custom); +#ifdef HTTP_HAVE_CURL zend_llist_clean(&G->request.copies.strings); zend_llist_clean(&G->request.copies.slists); zend_llist_clean(&G->request.copies.contexts); +#endif } /* }}} */