X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=php_http.c;h=3200a16eb2dbea26991e2b44023bfa193eb4755e;hp=62c1f8dd7a91e1220386166ddc5dfae9ebae5552;hb=refs%2Fheads%2Fv2.1.x;hpb=0b83632b2b0a03eeca090f993259ccd95ab646fb

diff --git a/php_http.c b/php_http.c
index 62c1f8d..3200a16 100644
--- a/php_http.c
+++ b/php_http.c
@@ -6,7 +6,7 @@
     | 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>            |
     +--------------------------------------------------------------------+
 */
 
@@ -20,7 +20,12 @@
 #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
@@ -55,9 +60,6 @@ static zend_module_dep http_module_deps[] = {
 #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}
 };
@@ -73,7 +75,7 @@ zend_module_entry http_module_entry = {
 	PHP_RINIT(http),
 	PHP_RSHUTDOWN(http),
 	PHP_MINFO(http),
-	PHP_HTTP_EXT_VERSION,
+	PHP_PECL_HTTP_VERSION,
 	STANDARD_MODULE_PROPERTIES
 };
 
@@ -134,7 +136,6 @@ PHP_MINIT_FUNCTION(http)
 	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)
@@ -186,9 +187,6 @@ 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_client_curl)
-#endif
 	) {
 		return FAILURE;
 	}
@@ -199,9 +197,6 @@ PHP_RINIT_FUNCTION(http)
 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;
@@ -218,7 +213,7 @@ PHP_MINFO_FUNCTION(http)
 
 	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();