projects
/
m6w6
/
ext-http
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
- rename the configure option for libevent support and add the possibility
[m6w6/ext-http]
/
http.c
diff --git
a/http.c
b/http.c
index 0299d2f920d904d7422898353d219e32d59bacef..f6b21189a48136400cdedb1e2c685af1e9559504 100644
(file)
--- a/
http.c
+++ b/
http.c
@@
-14,6
+14,7
@@
#define HTTP_WANT_SAPI
#define HTTP_WANT_CURL
#define HTTP_WANT_SAPI
#define HTTP_WANT_CURL
+#define HTTP_WANT_EVENT
#define HTTP_WANT_ZLIB
#define HTTP_WANT_MAGIC
#include "php_http.h"
#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_ICONV
ZEND_MOD_REQUIRED("iconv")
# endif
+# ifdef HTTP_HAVE_EVENT
+ ZEND_MOD_CONFLICTS("event")
+#endif
{NULL, NULL, NULL, 0}
};
#endif
{NULL, NULL, NULL, 0}
};
#endif
@@
-201,13
+205,15
@@
static inline void _http_globals_free(zend_http_globals *G TSRMLS_DC)
}
}
}
}
-#if PHP_DEBUG
+#if defined(ZTS) && defined(PHP_DEBUG)
+#if ZTS && PHP_DEBUG
zend_http_globals *http_globals(void)
{
TSRMLS_FETCH();
return HTTP_G;
}
#endif
zend_http_globals *http_globals(void)
{
TSRMLS_FETCH();
return HTTP_G;
}
#endif
+#endif
/* }}} */
/* {{{ static inline void http_check_allowed_methods(char *) */
/* }}} */
/* {{{ static inline void http_check_allowed_methods(char *) */
@@
-361,6
+367,9
@@
PHP_RINIT_FUNCTION(http)
#endif
#ifdef HTTP_HAVE_CURL
# ifdef ZEND_ENGINE_2
#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
|| SUCCESS != PHP_RINIT_CALL(http_request_datashare)
# endif
#endif