| modification, are permitted provided that the conditions mentioned |
| in the accompanying LICENSE file are met. |
+--------------------------------------------------------------------+
- | Copyright (c) 2004-2010, Michael Wallner <mike@php.net> |
+ | Copyright (c) 2004-2011, Michael Wallner <mike@php.net> |
+--------------------------------------------------------------------+
*/
-/* $Id: http.c 300300 2010-06-09 07:29:35Z mike $ */
+#include "php_http_api.h"
-#include "php_http.h"
+#include <php_ini.h>
+#include <ext/standard/info.h>
#include <zlib.h>
-#ifdef PHP_HTTP_HAVE_CURL
+
+#if PHP_HTTP_HAVE_CURL
# include <curl/curl.h>
-# ifdef PHP_HTTP_HAVE_EVENT
+# if PHP_HTTP_HAVE_EVENT
# include <event.h>
# endif
#endif
-#ifdef PHP_HTTP_HAVE_NEON
-# include "neon/ne_utils.h"
+#if PHP_HTTP_HAVE_SERF
+# include <serf.h>
#endif
-#include <main/php_ini.h>
-#include <ext/standard/info.h>
-#include <Zend/zend_extensions.h>
-
ZEND_DECLARE_MODULE_GLOBALS(php_http);
#ifdef COMPILE_DL_HTTP
}
#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)
- PHP_HTTP_INI_ENTRY("http.request_datashare.dns", "1", PHP_INI_SYSTEM, OnUpdateBool, request_datashare.dns)
- 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.etag.mode", "crc32b", PHP_INI_ALL, OnUpdateString, env.etag_mode)
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)
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)
|| 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)
|| SUCCESS != PHP_MINIT_CALL(http_querystring)
- || SUCCESS != PHP_MINIT_CALL(http_request_factory)
- || SUCCESS != PHP_MINIT_CALL(http_request)
+ || SUCCESS != PHP_MINIT_CALL(http_client_interface)
+ || SUCCESS != PHP_MINIT_CALL(http_client)
+ || SUCCESS != PHP_MINIT_CALL(http_client_request)
+ || SUCCESS != PHP_MINIT_CALL(http_client_response)
+ || SUCCESS != PHP_MINIT_CALL(http_client_datashare)
+ || SUCCESS != PHP_MINIT_CALL(http_client_pool)
+ || SUCCESS != PHP_MINIT_CALL(http_client_factory)
+#if PHP_HTTP_HAVE_CURL
|| SUCCESS != PHP_MINIT_CALL(http_curl)
- || SUCCESS != PHP_MINIT_CALL(http_neon)
- || SUCCESS != PHP_MINIT_CALL(http_request_datashare)
- || SUCCESS != PHP_MINIT_CALL(http_request_method)
- || SUCCESS != PHP_MINIT_CALL(http_request_pool)
+#endif
+ || SUCCESS != PHP_MINIT_CALL(http_client_curl)
+ || SUCCESS != PHP_MINIT_CALL(http_client_pool_curl)
+ || SUCCESS != PHP_MINIT_CALL(http_client_datashare_curl)
|| SUCCESS != PHP_MINIT_CALL(http_url)
|| SUCCESS != PHP_MINIT_CALL(http_env)
+ || SUCCESS != PHP_MINIT_CALL(http_env_request)
|| SUCCESS != PHP_MINIT_CALL(http_env_response)
+ || SUCCESS != PHP_MINIT_CALL(http_params)
) {
return FAILURE;
}
if (0
|| SUCCESS != PHP_MSHUTDOWN_CALL(http_message)
+#if PHP_HTTP_HAVE_CURL
|| SUCCESS != PHP_MSHUTDOWN_CALL(http_curl)
- || SUCCESS != PHP_MSHUTDOWN_CALL(http_neon)
- || SUCCESS != PHP_MSHUTDOWN_CALL(http_request_datashare)
- || SUCCESS != PHP_MSHUTDOWN_CALL(http_request_factory)
+#endif
|| SUCCESS != PHP_MSHUTDOWN_CALL(http_persistent_handle)
+ || SUCCESS != PHP_MSHUTDOWN_CALL(http_client_factory)
) {
return FAILURE;
}
{
if (0
|| SUCCESS != PHP_RINIT_CALL(http_env)
- || SUCCESS != PHP_RINIT_CALL(http_request_datashare)
- || SUCCESS != PHP_RINIT_CALL(http_curl)
+#if PHP_HTTP_HAVE_CURL && PHP_HTTP_HAVE_EVENT
+ || SUCCESS != PHP_RINIT_CALL(http_client_pool_curl)
+#endif
) {
return FAILURE;
}
{
if (0
|| SUCCESS != PHP_RSHUTDOWN_CALL(http_env)
- || SUCCESS != PHP_RSHUTDOWN_CALL(http_request_datashare)
) {
return FAILURE;
}
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);
#else
php_info_print_table_row(3, "libcurl", "disabled", "disabled");
#endif
-#ifdef 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
-#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");
#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();