X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=http_request_api.c;h=3f77eff2ae55bc37e2ad541ed9bf1254a5f4e840;hb=c29a7d9166d1645533f06fdd206782c9b8176eb3;hp=24b1acc5a8bd3e0a3cd53f237f7cbbd5f916a158;hpb=046207d5dd06a35f4c492c6169ecfbd8999671cb;p=m6w6%2Fext-http diff --git a/http_request_api.c b/http_request_api.c index 24b1acc..3f77eff 100644 --- a/http_request_api.c +++ b/http_request_api.c @@ -18,6 +18,15 @@ #ifdef HAVE_CONFIG_H # include "config.h" #endif +#include "php.h" + +#include "php_http.h" +#include "php_http_std_defs.h" +#include "php_http_api.h" +#include "php_http_request_api.h" +#include "php_http_url_api.h" + +#include "phpstr/phpstr.h" #ifdef PHP_WIN32 # include @@ -25,21 +34,12 @@ #include -#include "phpstr/phpstr.h" - -#include "php.h" -#include "php_http.h" -#include "php_http_std_defs.h" -#include "php_http_api.h" -#include "php_http_request_api.h" -#include "php_http_url_api.h" +ZEND_EXTERN_MODULE_GLOBALS(http); #ifndef HTTP_CURL_USE_ZEND_MM # define HTTP_CURL_USE_ZEND_MM 0 #endif -ZEND_EXTERN_MODULE_GLOBALS(http) - #if LIBCURL_VERSION_NUM < 0x070c00 # define curl_easy_strerror(code) HTTP_G(request).error #endif @@ -507,7 +507,7 @@ PHP_HTTP_API STATUS _http_request_init(CURL *ch, http_request_method meth, char } else { HTTP_CURL_OPT(COOKIEFILE, NULL); } - + /* cookiestore, read initial cookies from that file and store cookies back into that file */ if ((zoption = http_curl_getopt(options, "cookiestore", IS_STRING)) && Z_STRLEN_P(zoption)) { HTTP_CURL_OPT(COOKIEFILE, http_request_data_copy(COPY_STRING, Z_STRVAL_P(zoption)));