X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=php_http.c;h=b71e6c26115722c305634811dbe31ef5909a1d96;hp=5ce8aa4a0372c779c7147932f48da25e6e4a4975;hb=8d05291f42b3b42159b3fe91492aa4862f3d4405;hpb=df06e2dbf48a3b0d96f2c62071c1b5fc907a98d0 diff --git a/php_http.c b/php_http.c index 5ce8aa4..b71e6c2 100644 --- a/php_http.c +++ b/php_http.c @@ -6,24 +6,25 @@ | modification, are permitted provided that the conditions mentioned | | in the accompanying LICENSE file are met. | +--------------------------------------------------------------------+ - | Copyright (c) 2004-2010, Michael Wallner | + | Copyright (c) 2004-2011, Michael Wallner | +--------------------------------------------------------------------+ */ -/* $Id: http.c 300300 2010-06-09 07:29:35Z mike $ */ - #include "php_http.h" #include -#ifdef PHP_HTTP_HAVE_CURL +#if PHP_HTTP_HAVE_CURL # include -# ifdef PHP_HTTP_HAVE_EVENT +# if PHP_HTTP_HAVE_EVENT # include # endif #endif -#ifdef PHP_HTTP_HAVE_NEON +#if PHP_HTTP_HAVE_NEON # include "neon/ne_utils.h" #endif +#if PHP_HTTP_HAVE_SERF +# include "serf.h" +#endif #include
#include @@ -47,13 +48,13 @@ PHP_MINFO_FUNCTION(http); static zend_module_dep http_module_deps[] = { ZEND_MOD_REQUIRED("spl") -#ifdef PHP_HTTP_HAVE_HASH +#if PHP_HTTP_HAVE_HASH ZEND_MOD_REQUIRED("hash") #endif -#ifdef PHP_HTTP_HAVE_ICONV +#if PHP_HTTP_HAVE_ICONV ZEND_MOD_REQUIRED("iconv") #endif -#ifdef PHP_HTTP_HAVE_EVENT +#if PHP_HTTP_HAVE_EVENT ZEND_MOD_CONFLICTS("event") #endif {NULL, NULL, NULL, 0} @@ -92,7 +93,7 @@ void _dpf(int type, const char *data, size_t length) } fprintf(stderr, "\n"); } else { - fprintf(stderr, "# %.*s\n", (long) length, data); + fprintf(stderr, "# %.*s\n", (int) length, data); } } #endif @@ -112,19 +113,13 @@ static inline void php_http_globals_free(zend_php_http_globals *G TSRMLS_DC) #if defined(ZTS) && defined(PHP_DEBUG) #if ZTS && PHP_DEBUG -zend_http_globals *php_http_globals(void) +zend_php_http_globals *php_http_globals(void) { TSRMLS_FETCH(); return PHP_HTTP_G; } #endif #endif -PHP_INI_MH(http_update_persistent_handle_ident) -{ - PHP_HTTP_G->persistent_handle.ident.h = zend_hash_func(new_value, PHP_HTTP_G->persistent_handle.ident.l = new_value_length+1); - return OnUpdateString(entry, new_value, new_value_length, mh_arg1, mh_arg2, mh_arg3, stage TSRMLS_CC); -} - PHP_INI_BEGIN() PHP_HTTP_INI_ENTRY("http.etag.mode", "md5", PHP_INI_ALL, OnUpdateString, env.etag_mode) PHP_HTTP_INI_ENTRY("http.request_datashare.cookie", "0", PHP_INI_SYSTEM, OnUpdateBool, request_datashare.cookie) @@ -132,7 +127,6 @@ PHP_INI_BEGIN() PHP_HTTP_INI_ENTRY("http.request_datashare.ssl", "0", PHP_INI_SYSTEM, OnUpdateBool, request_datashare.ssl) PHP_HTTP_INI_ENTRY("http.request_datashare.connect", "0", PHP_INI_SYSTEM, OnUpdateBool, request_datashare.connect) PHP_HTTP_INI_ENTRY("http.persistent_handle.limit", "-1", PHP_INI_SYSTEM, OnUpdateLong, persistent_handle.limit) - PHP_HTTP_INI_ENTRY("http.persistent_handle.ident", "GLOBAL", PHP_INI_ALL, http_update_persistent_handle_ident, persistent_handle.ident.s) PHP_INI_END() PHP_MINIT_FUNCTION(http) @@ -142,7 +136,6 @@ PHP_MINIT_FUNCTION(http) REGISTER_INI_ENTRIES(); if (0 - || SUCCESS != PHP_MINIT_CALL(http_fluently_callable) || SUCCESS != PHP_MINIT_CALL(http_object) || SUCCESS != PHP_MINIT_CALL(http_exception) || SUCCESS != PHP_MINIT_CALL(http_persistent_handle) @@ -155,13 +148,18 @@ PHP_MINIT_FUNCTION(http) || SUCCESS != PHP_MINIT_CALL(http_querystring) || SUCCESS != PHP_MINIT_CALL(http_request_factory) || 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) || SUCCESS != PHP_MINIT_CALL(http_request_pool) || SUCCESS != PHP_MINIT_CALL(http_url) || SUCCESS != PHP_MINIT_CALL(http_env) + || SUCCESS != PHP_MINIT_CALL(http_env_response) ) { return FAILURE; } @@ -177,11 +175,15 @@ PHP_MSHUTDOWN_FUNCTION(http) if (0 || 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_persistent_handle) || SUCCESS != PHP_MSHUTDOWN_CALL(http_request_factory) + || SUCCESS != PHP_MSHUTDOWN_CALL(http_persistent_handle) ) { return FAILURE; } @@ -194,7 +196,9 @@ PHP_RINIT_FUNCTION(http) if (0 || SUCCESS != PHP_RINIT_CALL(http_env) || SUCCESS != PHP_RINIT_CALL(http_request_datashare) +#if PHP_HTTP_HAVE_CURL || SUCCESS != PHP_RINIT_CALL(http_curl) +#endif ) { return FAILURE; } @@ -224,7 +228,7 @@ PHP_MINFO_FUNCTION(http) php_info_print_table_start(); php_info_print_table_header(3, "Used Library", "Compiled", "Linked"); php_info_print_table_row(3, "libz", ZLIB_VERSION, zlibVersion()); -#ifdef PHP_HTTP_HAVE_CURL +#if PHP_HTTP_HAVE_CURL { curl_version_info_data *cv = curl_version_info(CURLVERSION_NOW); php_info_print_table_row(3, "libcurl", LIBCURL_VERSION, cv->version); @@ -232,7 +236,7 @@ PHP_MINFO_FUNCTION(http) #else php_info_print_table_row(3, "libcurl", "disabled", "disabled"); #endif -#ifdef PHP_HTTP_HAVE_NEON +#if PHP_HTTP_HAVE_NEON { char ne_v[16] = {0}; sscanf(ne_version_string(), "neon %15[^ :]", &ne_v[0]); @@ -242,7 +246,7 @@ PHP_MINFO_FUNCTION(http) php_info_print_table_row(3, "libneon", "disabled", "disabled"); #endif -#ifdef PHP_HTTP_HAVE_EVENT +#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"); @@ -264,8 +268,8 @@ PHP_MINFO_FUNCTION(http) FOREACH_KEYVAL(pos2, *val, ident, sub) { if ( SUCCESS == zend_hash_find(Z_ARRVAL_PP(sub), ZEND_STRS("used"), (void *) &zused) && SUCCESS == zend_hash_find(Z_ARRVAL_PP(sub), ZEND_STRS("free"), (void *) &zfree)) { - zval *used = php_http_zsep(IS_STRING, *zused); - zval *free = php_http_zsep(IS_STRING, *zfree); + zval *used = php_http_ztyp(IS_STRING, *zused); + zval *free = php_http_ztyp(IS_STRING, *zfree); php_info_print_table_row(4, provider.str, ident.str, Z_STRVAL_P(used), Z_STRVAL_P(free)); zval_ptr_dtor(&used); zval_ptr_dtor(&free);