X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=php_http.c;h=36f2caa42b6a05dc9948939ff921430d6f53daa3;hp=b71e6c26115722c305634811dbe31ef5909a1d96;hb=4d68865693332389b875e4466f8b5368c0876e15;hpb=8d05291f42b3b42159b3fe91492aa4862f3d4405 diff --git a/php_http.c b/php_http.c index b71e6c2..36f2caa 100644 --- a/php_http.c +++ b/php_http.c @@ -10,26 +10,23 @@ +--------------------------------------------------------------------+ */ -#include "php_http.h" +#include "php_http_api.h" + +#include +#include #include + #if PHP_HTTP_HAVE_CURL # include # if PHP_HTTP_HAVE_EVENT # include # endif #endif -#if PHP_HTTP_HAVE_NEON -# include "neon/ne_utils.h" -#endif #if PHP_HTTP_HAVE_SERF -# include "serf.h" +# include #endif -#include
-#include -#include - ZEND_DECLARE_MODULE_GLOBALS(php_http); #ifdef COMPILE_DL_HTTP @@ -48,13 +45,13 @@ PHP_MINFO_FUNCTION(http); static zend_module_dep http_module_deps[] = { ZEND_MOD_REQUIRED("spl") -#if PHP_HTTP_HAVE_HASH +#ifdef PHP_HTTP_HAVE_HASH ZEND_MOD_REQUIRED("hash") #endif -#if PHP_HTTP_HAVE_ICONV +#ifdef PHP_HTTP_HAVE_ICONV ZEND_MOD_REQUIRED("iconv") #endif -#if PHP_HTTP_HAVE_EVENT +#ifdef PHP_HTTP_HAVE_EVENT ZEND_MOD_CONFLICTS("event") #endif {NULL, NULL, NULL, 0} @@ -142,6 +139,7 @@ PHP_MINIT_FUNCTION(http) || SUCCESS != PHP_MINIT_CALL(http_cookie) || SUCCESS != PHP_MINIT_CALL(http_encoding) || SUCCESS != PHP_MINIT_CALL(http_filter) + || SUCCESS != PHP_MINIT_CALL(http_header) || SUCCESS != PHP_MINIT_CALL(http_message) || SUCCESS != PHP_MINIT_CALL(http_message_body) || SUCCESS != PHP_MINIT_CALL(http_property_proxy) @@ -150,9 +148,6 @@ PHP_MINIT_FUNCTION(http) || SUCCESS != PHP_MINIT_CALL(http_request) #if PHP_HTTP_HAVE_CURL || SUCCESS != PHP_MINIT_CALL(http_curl) -#endif -#if PHP_HTTP_HAVE_NEON - || SUCCESS != PHP_MINIT_CALL(http_neon) #endif || SUCCESS != PHP_MINIT_CALL(http_request_datashare) || SUCCESS != PHP_MINIT_CALL(http_request_method) @@ -160,6 +155,7 @@ PHP_MINIT_FUNCTION(http) || SUCCESS != PHP_MINIT_CALL(http_url) || SUCCESS != PHP_MINIT_CALL(http_env) || SUCCESS != PHP_MINIT_CALL(http_env_response) + || SUCCESS != PHP_MINIT_CALL(http_params) ) { return FAILURE; } @@ -177,9 +173,6 @@ PHP_MSHUTDOWN_FUNCTION(http) || SUCCESS != PHP_MSHUTDOWN_CALL(http_message) #if PHP_HTTP_HAVE_CURL || SUCCESS != PHP_MSHUTDOWN_CALL(http_curl) -#endif -#if PHP_HTTP_HAVE_NEON - || SUCCESS != PHP_MSHUTDOWN_CALL(http_neon) #endif || SUCCESS != PHP_MSHUTDOWN_CALL(http_request_datashare) || SUCCESS != PHP_MSHUTDOWN_CALL(http_request_factory) @@ -236,21 +229,25 @@ PHP_MINFO_FUNCTION(http) #else php_info_print_table_row(3, "libcurl", "disabled", "disabled"); #endif -#if PHP_HTTP_HAVE_NEON - { - char ne_v[16] = {0}; - sscanf(ne_version_string(), "neon %15[^ :]", &ne_v[0]); - php_info_print_table_row(3, "libneon", PHP_HTTP_NEON_VERSION, ne_v); - } -#else - php_info_print_table_row(3, "libneon", "disabled", "disabled"); -#endif #if PHP_HTTP_HAVE_EVENT php_info_print_table_row(3, "libevent", PHP_HTTP_EVENT_VERSION, event_get_version()); #else php_info_print_table_row(3, "libevent", "disabled", "disabled"); #endif + +#if PHP_HTTP_HAVE_SERF + { + int v[3]; + char sl_v[16] = {0}; + + serf_lib_version(&v[0], &v[1], &v[2]); + slprintf(sl_v, lenof(sl_v), "%d.%d.%d", v[0], v[1], v[2]); + php_info_print_table_row(3, "libserf", SERF_VERSION_STRING, sl_v); + } +#else + php_info_print_table_row(3, "libserf", "disabled", "disabled"); +#endif php_info_print_table_end(); php_info_print_table_start();