| modification, are permitted provided that the conditions mentioned |
| in the accompanying LICENSE file are met. |
+--------------------------------------------------------------------+
- | Copyright (c) 2004-2011, Michael Wallner <mike@php.net> |
+ | Copyright (c) 2004-2014, Michael Wallner <mike@php.net> |
+--------------------------------------------------------------------+
*/
#if PHP_HTTP_HAVE_CURL
# include <curl/curl.h>
# if PHP_HTTP_HAVE_EVENT
-# include <event.h>
+# if PHP_HTTP_HAVE_EVENT2
+# include <event2/event.h>
+# include <event2/event_struct.h>
+# else
+# include <event.h>
+# endif
# endif
#endif
-#if PHP_HTTP_HAVE_SERF
-# include <serf.h>
+#if PHP_HTTP_HAVE_IDN2
+# include <idn2.h>
+#elif PHP_HTTP_HAVE_IDN
+# include <idna.h>
#endif
ZEND_DECLARE_MODULE_GLOBALS(php_http);
PHP_MINIT_FUNCTION(http);
PHP_MSHUTDOWN_FUNCTION(http);
-PHP_RINIT_FUNCTION(http);
PHP_RSHUTDOWN_FUNCTION(http);
PHP_MINFO_FUNCTION(http);
#endif
#ifdef PHP_HTTP_HAVE_ICONV
ZEND_MOD_REQUIRED("iconv")
-#endif
-#ifdef PHP_HTTP_HAVE_JSON
- ZEND_MOD_REQUIRED("json")
-#endif
-#ifdef PHP_HTTP_HAVE_EVENT
- ZEND_MOD_CONFLICTS("event")
#endif
{NULL, NULL, NULL, 0}
};
http_functions,
PHP_MINIT(http),
PHP_MSHUTDOWN(http),
- PHP_RINIT(http),
+ NULL,
PHP_RSHUTDOWN(http),
PHP_MINFO(http),
- PHP_HTTP_EXT_VERSION,
+ PHP_PECL_HTTP_VERSION,
STANDARD_MODULE_PROPERTIES
};
int http_module_number;
-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)
{
}
#endif
-#if ZTS && PHP_DEBUG && !HAVE_GCOV
-zend_php_http_globals *php_http_globals(void)
-{
- TSRMLS_FETCH();
- return PHP_HTTP_G;
-}
-#endif
-
PHP_INI_BEGIN()
- PHP_HTTP_INI_ENTRY("http.etag.mode", "crc32b", PHP_INI_ALL, OnUpdateString, env.etag_mode)
+ STD_PHP_INI_ENTRY("http.etag.mode", "crc32b", PHP_INI_ALL, OnUpdateString, env.etag_mode, zend_php_http_globals, php_http_globals)
PHP_INI_END()
PHP_MINIT_FUNCTION(http)
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_encoding)
|| SUCCESS != PHP_MINIT_CALL(http_filter)
|| SUCCESS != PHP_MINIT_CALL(http_header)
+ || SUCCESS != PHP_MINIT_CALL(http_header_parser)
|| SUCCESS != PHP_MINIT_CALL(http_message)
+ || SUCCESS != PHP_MINIT_CALL(http_message_parser)
|| SUCCESS != PHP_MINIT_CALL(http_message_body)
|| SUCCESS != PHP_MINIT_CALL(http_querystring)
- || 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)
+ || SUCCESS != PHP_MINIT_CALL(http_client_curl)
#endif
|| SUCCESS != PHP_MINIT_CALL(http_url)
|| SUCCESS != PHP_MINIT_CALL(http_env)
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_client_curl)
|| SUCCESS != PHP_MSHUTDOWN_CALL(http_curl)
#endif
- || SUCCESS != PHP_MSHUTDOWN_CALL(http_client_factory)
- ) {
- return FAILURE;
- }
-
- zend_hash_destroy(&http_module_classes);
-
- return SUCCESS;
-}
-
-PHP_RINIT_FUNCTION(http)
-{
- if (0
- || SUCCESS != PHP_RINIT_CALL(http_env)
-#if PHP_HTTP_HAVE_CURL && PHP_HTTP_HAVE_EVENT
- || SUCCESS != PHP_RINIT_CALL(http_curl_client_pool)
-#endif
+ || SUCCESS != PHP_MSHUTDOWN_CALL(http_client)
) {
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)
) {
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);
+ php_info_print_table_row(2, "Extension Version", PHP_PECL_HTTP_VERSION);
php_info_print_table_end();
php_info_print_table_start();
php_info_print_table_row(3, "libevent", "disabled", "disabled");
#endif
-#if PHP_HTTP_HAVE_SERF
- {
- int v[3];
-
- serf_lib_version(&v[0], &v[1], &v[2]);
- 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");
+#if PHP_HTTP_HAVE_IDN2
+ php_info_print_table_row(3, "libidn2 (IDNA2008)", IDN2_VERSION, idn2_check_version(NULL));
+#elif PHP_HTTP_HAVE_IDN
+ php_info_print_table_row(3, "libidn (IDNA2003)", PHP_HTTP_LIBIDN_VERSION, "unknown");
#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_dtor(&buf);
- php_info_print_table_row(2, "Stream Filters", "http.chunked_encode, http.chunked_decode, http.inflate, http.deflate");
php_info_print_table_end();
-
-
+
DISPLAY_INI_ENTRIES();
}
projects / m6w6 / ext-http / blobdiff