fix bug #66388 (Crash on POST with Content-Length:0 and untouched body)

[m6w6/ext-http] / php_http.c

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