remove pecl/event conflict

diff --git a/config9.m4 b/config9.m4
index aff67ca6656c71463addfca0f9fd68f82c09741e..a5ede93f7ba36990cf0bf5fe2420a75b3156176d 100644 (file)
--- a/config9.m4
+++ b/config9.m4
@@ -289,50 +289,45 @@ dnl ----
        if test "$PHP_HTTP_LIBEVENT_DIR" = "no"; then
                AC_DEFINE([PHP_HTTP_HAVE_EVENT], [0], [ ])
        else
-               HTTP_HAVE_PHP_EXT([event], [
-                       AC_MSG_WARN([event support is incompatible with pecl/event; continuing without libevent support])
+               AC_MSG_CHECKING([for event2/event.h])
+               EVENT_DIR=
+               for i in "$PHP_HTTP_LIBEVENT_DIR" /usr/local /usr /opt; do
+                       if test -f "$i/include/event.h"; then
+                               EVENT_DIR=$i
+                               break
+                       fi
+               done
+               if test "x$EVENT_DIR" = "x"; then
+                       AC_MSG_RESULT([not found])
+                       AC_MSG_WARN([continuing without libevent support])
                        AC_DEFINE([PHP_HTTP_HAVE_EVENT], [0], [ ])
-               ], [
-                       AC_MSG_CHECKING([for event2/event.h])
-                       EVENT_DIR=
-                       for i in "$PHP_HTTP_LIBEVENT_DIR" /usr/local /usr /opt; do
-                               if test -f "$i/include/event.h"; then
-                                       EVENT_DIR=$i
-                                       break
-                               fi
-                       done
-                       if test "x$EVENT_DIR" = "x"; then
-                               AC_MSG_RESULT([not found])
-                               AC_MSG_WARN([continuing without libevent support])
-                               AC_DEFINE([PHP_HTTP_HAVE_EVENT], [0], [ ])
+               else
+                       AC_MSG_RESULT([found in $EVENT_DIR])
+                       
+                       AC_MSG_CHECKING([for libevent version, roughly])
+                       
+                       if test -f "$EVENT_DIR/include/event2/event.h"; then
+                               EVENT_VER="`$EGREP _EVENT_VERSION $EVENT_DIR/include/event2/event-config.h | $AWK '{print $3}'`"
+                               AC_DEFINE([PHP_HTTP_HAVE_EVENT2], [1], [ ])
                        else
-                               AC_MSG_RESULT([found in $EVENT_DIR])
-                               
-                               AC_MSG_CHECKING([for libevent version, roughly])
-                               
-                               if test -f "$EVENT_DIR/include/event2/event.h"; then
-                                       EVENT_VER="`$EGREP _EVENT_VERSION $EVENT_DIR/include/event2/event-config.h | $AWK '{print $3}'`"
-                                       AC_DEFINE([PHP_HTTP_HAVE_EVENT2], [1], [ ])
-                               else
-                                       AC_DEFINE([PHP_HTTP_HAVE_EVENT2], [0], [ ])
-                                       if test -f "$EVENT_DIR/include/evhttp.h" && test -f "$EVENT_DIR/include/evdns.h"; then
-                                               if test -f "$EVENT_DIR/include/evrpc.h"; then
-                                                       EVENT_VER="1.4 or greater"
-                                               else
-                                                       EVENT_VER="1.2 or greater"
-                                               fi
+                               AC_DEFINE([PHP_HTTP_HAVE_EVENT2], [0], [ ])
+                               if test -f "$EVENT_DIR/include/evhttp.h" && test -f "$EVENT_DIR/include/evdns.h"; then
+                                       if test -f "$EVENT_DIR/include/evrpc.h"; then
+                                               EVENT_VER="1.4 or greater"
                                        else
-                                               EVENT_VER="1.1b or lower"
+                                               EVENT_VER="1.2 or greater"
                                        fi
+                               else
+                                       EVENT_VER="1.1b or lower"
                                fi
-                               AC_DEFINE_UNQUOTED([PHP_HTTP_EVENT_VERSION], ["$EVENT_VER"], [ ])
-                               AC_MSG_RESULT([$EVENT_VER])
-                               
-                               PHP_ADD_INCLUDE($EVENT_DIR/include)
-                               PHP_ADD_LIBRARY_WITH_PATH(event, $EVENT_DIR/$PHP_LIBDIR, HTTP_SHARED_LIBADD)
-                               AC_DEFINE([PHP_HTTP_HAVE_EVENT], [1], [Have libevent support for cURL])
                        fi
-               ])
+                       AC_DEFINE_UNQUOTED([PHP_HTTP_EVENT_VERSION], ["$EVENT_VER"], [ ])
+                       AC_MSG_RESULT([$EVENT_VER])
+                       
+                       PHP_ADD_INCLUDE($EVENT_DIR/include)
+                       PHP_ADD_LIBRARY_WITH_PATH(event, $EVENT_DIR/$PHP_LIBDIR, HTTP_SHARED_LIBADD)
+                       AC_DEFINE([PHP_HTTP_HAVE_EVENT], [1], [Have libevent support for cURL])
+               fi
        fi
 
 dnl ----

diff --git a/package.xml b/package.xml
index 9bcb81f42e9b08045b20036b11a2ff67fc4f90f3..120307e23fc9e61f86eb327226be6f8b224549a5 100644 (file)
--- a/package.xml
+++ b/package.xml
@@ -39,7 +39,7 @@ v2: http://dev.iworks.at/ext-http/lcov/ext/http/
  </lead>
  <date>2013-12-10</date>
  <version>
-  <release>2.0.3</release>
+  <release>2.0.4dev</release>
   <api>2.0.0</api>
  </version>
  <stability>
@@ -48,7 +48,7 @@ v2: http://dev.iworks.at/ext-http/lcov/ext/http/
  </stability>
  <license>BSD, revised</license>
  <notes><![CDATA[
-* Fixed typo
+* Removed the pecl/event conflict
 ]]></notes>
  <contents>
   <dir name="/">

diff --git a/php_http.c b/php_http.c
index c3838b80b905ac7dee1e6bb4df2af603c438a1e8..91a10e9615de60e95184cd1d2588d759316fabce 100644 (file)
--- a/php_http.c
+++ b/php_http.c
@@ -60,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}
 };

diff --git a/php_http.h b/php_http.h
index 53edbdf3b2a84a6e976f122fa52eea4ceded2e90..dde1e6b2f9df3d3e3082f946890ad2a14832decb 100644 (file)
--- a/php_http.h
+++ b/php_http.h
@@ -13,7 +13,7 @@
 #ifndef PHP_EXT_HTTP_H
 #define PHP_EXT_HTTP_H
 
-#define PHP_PECL_HTTP_VERSION "2.0.3"
+#define PHP_PECL_HTTP_VERSION "2.0.4dev"
 
 extern zend_module_entry http_module_entry;
 #define phpext_http_ptr &http_module_entry