X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=php_http.c;h=2101f0b70c278f1fdd9ad61125193739433c0f97;hp=2ed94c8e1bf78cdf231445735a29ec05ffc64d70;hb=d7f91cdeb926694858b07d77e29e10d5617112b1;hpb=87db9817d428282792c8146d9c2ae9748ebf6f1e

diff --git a/php_http.c b/php_http.c
index 2ed94c8..2101f0b 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
 };
 
@@ -217,7 +219,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();