| modification, are permitted provided that the conditions mentioned |
| in the accompanying LICENSE file are met. |
+--------------------------------------------------------------------+
- | Copyright (c) 2004-2013, 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
#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}
};
PHP_RINIT(http),
PHP_RSHUTDOWN(http),
PHP_MINFO(http),
- PHP_HTTP_EXT_VERSION,
+ PHP_PECL_HTTP_VERSION,
STANDARD_MODULE_PROPERTIES
};
REGISTER_INI_ENTRIES();
if (0
- || SUCCESS != PHP_MINIT_CALL(http_object)
|| SUCCESS != PHP_MINIT_CALL(http_exception)
|| 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_parser)
|| SUCCESS != PHP_MINIT_CALL(http_message_body)
|| SUCCESS != PHP_MINIT_CALL(http_querystring)
|| SUCCESS != PHP_MINIT_CALL(http_client)
{
if (0
|| SUCCESS != PHP_RINIT_CALL(http_env)
-#if PHP_HTTP_HAVE_CURL && PHP_HTTP_HAVE_EVENT
- || SUCCESS != PHP_RINIT_CALL(http_client_curl)
-#endif
) {
return FAILURE;
}
PHP_RSHUTDOWN_FUNCTION(http)
{
if (0
-#if PHP_HTTP_HAVE_CURL && PHP_HTTP_HAVE_EVENT
- || SUCCESS != PHP_RSHUTDOWN_CALL(http_client_curl)
-#endif
|| SUCCESS != PHP_RSHUTDOWN_CALL(http_env)
) {
return FAILURE;
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();