X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http.c;h=f6b21189a48136400cdedb1e2c685af1e9559504;hp=b4ed0dfbdcd06083c61ef621912b0900522ba7b6;hb=9e37263154391dec762b839cad4b7dd13e35467e;hpb=2dc2f1f7e1142bc51fa5ac9e1004c56f9f82e47c diff --git a/http.c b/http.c index b4ed0df..f6b2118 100644 --- a/http.c +++ b/http.c @@ -14,6 +14,7 @@ #define HTTP_WANT_SAPI #define HTTP_WANT_CURL +#define HTTP_WANT_EVENT #define HTTP_WANT_ZLIB #define HTTP_WANT_MAGIC #include "php_http.h" @@ -140,6 +141,9 @@ static zend_module_dep http_module_deps[] = { # ifdef HTTP_HAVE_ICONV ZEND_MOD_REQUIRED("iconv") # endif +# ifdef HTTP_HAVE_EVENT + ZEND_MOD_CONFLICTS("event") +#endif {NULL, NULL, NULL, 0} }; #endif @@ -363,6 +367,9 @@ PHP_RINIT_FUNCTION(http) #endif #ifdef HTTP_HAVE_CURL # ifdef ZEND_ENGINE_2 +# ifdef HTTP_HAVE_EVENT + || SUCCESS != PHP_RINIT_CALL(http_request_pool) +# endif || SUCCESS != PHP_RINIT_CALL(http_request_datashare) # endif #endif