+--------------------------------------------------------------------+
*/
-#include "php_http.h"
+#include "php_http_api.h"
+
+#include <php_ini.h>
+#include <ext/standard/info.h>
#include <zlib.h>
+
#if PHP_HTTP_HAVE_CURL
# include <curl/curl.h>
# if PHP_HTTP_HAVE_EVENT
# include <event.h>
# endif
#endif
-#if PHP_HTTP_HAVE_NEON
-# include "neon/ne_utils.h"
-#endif
#if PHP_HTTP_HAVE_SERF
-# include "serf.h"
+# 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
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_JSON
+ ZEND_MOD_REQUIRED("json")
+#endif
+#ifdef PHP_HTTP_HAVE_EVENT
ZEND_MOD_CONFLICTS("event")
#endif
{NULL, NULL, NULL, 0}
int http_module_number;
-#if PHP_DEBUG
+static HashTable http_module_classes;
+void php_http_register_class(zend_class_entry *(*get_ce)(void))
+{
+ zend_hash_next_index_insert(&http_module_classes, &get_ce, sizeof(get_ce), NULL);
+}
+static void php_http_registered_classes(php_http_buffer_t *buf, unsigned flags)
+{
+ HashPosition pos;
+ zend_class_entry *(**get_ce)(void);
+
+ FOREACH_HASH_VAL(pos, &http_module_classes, get_ce) {
+ zend_class_entry *ce = (*get_ce)();
+ if ((flags && (ce->ce_flags & flags)) || (!flags && !(ce->ce_flags & 0x0fff))) {
+ if (buf->used) {
+ php_http_buffer_appends(buf, ", ");
+ }
+ php_http_buffer_append(buf, ce->name, ce->name_length);
+ }
+ }
+ php_http_buffer_fix(buf);
+}
+
+#if PHP_DEBUG && !HAVE_GCOV
void _dpf(int type, const char *data, size_t length)
{
static const char _sym[] = "><><><";
memset(G, 0, sizeof(*G));
}
+#if 0
static inline void php_http_globals_init(zend_php_http_globals *G TSRMLS_DC)
{
}
static inline void php_http_globals_free(zend_php_http_globals *G TSRMLS_DC)
{
}
+#endif
-#if defined(ZTS) && defined(PHP_DEBUG)
-#if ZTS && PHP_DEBUG
+#if ZTS && PHP_DEBUG && !HAVE_GCOV
zend_php_http_globals *php_http_globals(void)
{
TSRMLS_FETCH();
return PHP_HTTP_G;
}
#endif
-#endif
+
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_INI_END()
ZEND_INIT_MODULE_GLOBALS(php_http, php_http_globals_init_once, NULL);
REGISTER_INI_ENTRIES();
+ zend_hash_init(&http_module_classes, 0, NULL, NULL, 1);
+
if (0
|| SUCCESS != PHP_MINIT_CALL(http_object)
|| SUCCESS != PHP_MINIT_CALL(http_exception)
|| 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_curl_client)
+ || SUCCESS != PHP_MINIT_CALL(http_curl_client_pool)
+ || SUCCESS != PHP_MINIT_CALL(http_curl_client_datashare)
#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_request)
|| SUCCESS != PHP_MINIT_CALL(http_env_response)
|| SUCCESS != PHP_MINIT_CALL(http_params)
) {
if (0
|| SUCCESS != PHP_MSHUTDOWN_CALL(http_message)
#if PHP_HTTP_HAVE_CURL
+ || SUCCESS != PHP_MSHUTDOWN_CALL(http_curl_client)
|| 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)
|| SUCCESS != PHP_MSHUTDOWN_CALL(http_persistent_handle)
+ || SUCCESS != PHP_MSHUTDOWN_CALL(http_client_factory)
) {
return FAILURE;
}
+ zend_hash_destroy(&http_module_classes);
+
return SUCCESS;
}
{
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)
+#if PHP_HTTP_HAVE_CURL && PHP_HTTP_HAVE_EVENT
+ || SUCCESS != PHP_RINIT_CALL(http_curl_client_pool)
#endif
) {
return FAILURE;
PHP_RSHUTDOWN_FUNCTION(http)
{
if (0
+#if PHP_HTTP_HAVE_CURL && PHP_HTTP_HAVE_EVENT
+ || SUCCESS != PHP_RSHUTDOWN_CALL(http_curl_client_pool)
+#endif
|| SUCCESS != PHP_RSHUTDOWN_CALL(http_env)
- || SUCCESS != PHP_RSHUTDOWN_CALL(http_request_datashare)
) {
return FAILURE;
}
PHP_MINFO_FUNCTION(http)
{
+ unsigned i;
+ php_http_buffer_t buf;
+
+ php_http_buffer_init(&buf);
+
php_info_print_table_start();
php_info_print_table_header(2, "HTTP Support", "enabled");
php_info_print_table_row(2, "Extension Version", PHP_HTTP_EXT_VERSION);
#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());
+ php_info_print_table_row(3, "libevent",
+# ifdef LIBEVENT_VERSION
+ LIBEVENT_VERSION,
+# else
+ PHP_HTTP_EVENT_VERSION,
+# endif
+ 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);
+ php_http_buffer_appendf(&buf, "%d.%d.%d", v[0], v[1], v[2]);
+ php_http_buffer_fix(&buf);
+ php_info_print_table_row(3, "libserf", SERF_VERSION_STRING, buf.data);
+ php_http_buffer_reset(&buf);
}
#else
php_info_print_table_row(3, "libserf", "disabled", "disabled");
#endif
php_info_print_table_end();
+ php_info_print_table_start();
+ php_info_print_table_colspan_header(2, "Registered API");
+ for (i = 0; http_functions[i].fname; ++i) {
+ if (buf.used) {
+ php_http_buffer_appends(&buf, ", ");
+ }
+ php_http_buffer_appendl(&buf, http_functions[i].fname);
+ }
+ php_http_buffer_fix(&buf);
+ php_info_print_table_row(2, "Functions", buf.data);
+ php_http_buffer_reset(&buf);
+ php_http_registered_classes(&buf, ZEND_ACC_INTERFACE);
+ php_info_print_table_row(2, "Interfaces", buf.data);
+ php_http_buffer_reset(&buf);
+ php_http_registered_classes(&buf, ZEND_ACC_EXPLICIT_ABSTRACT_CLASS);
+ php_info_print_table_row(2, "Abstract Classes", buf.data);
+ php_http_buffer_reset(&buf);
+ php_http_registered_classes(&buf, 0);
+ php_info_print_table_row(2, "Implemented Classes", buf.data);
+ php_http_buffer_reset(&buf);
+ php_http_registered_classes(&buf, ZEND_ACC_FINAL_CLASS);
+ php_info_print_table_row(2, "Final Classes", buf.data);
+ php_http_buffer_reset(&buf);
+
+ php_info_print_table_row(2, "Stream Filters", "http.chunked_encode, http.chunked_decode, http.inflate, http.deflate");
+ php_info_print_table_end();
+
php_info_print_table_start();
php_info_print_table_colspan_header(4, "Persistent Handles");
php_info_print_table_header(4, "Provider", "Ident", "Used", "Free");
}
php_info_print_table_end();
+ php_http_buffer_dtor(&buf);
+
DISPLAY_INI_ENTRIES();
}
projects / m6w6 / ext-http / blobdiff