projects
/
m6w6
/
ext-http
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
fix leak; fix history
[m6w6/ext-http]
/
php_http.c
diff --git
a/php_http.c
b/php_http.c
index bad11c0bde6f80a3175ea508baea6f73ffda4f3b..128937d47737314d29235615d3b426e1b62052fe 100644
(file)
--- a/
php_http.c
+++ b/
php_http.c
@@
-51,6
+51,9
@@
static zend_module_dep http_module_deps[] = {
#ifdef PHP_HTTP_HAVE_ICONV
ZEND_MOD_REQUIRED("iconv")
#endif
#ifdef PHP_HTTP_HAVE_ICONV
ZEND_MOD_REQUIRED("iconv")
#endif
+#ifdef PHP_HTTP_HAVE_JSON
+ ZEND_MOD_REQUIRED("json")
+#endif
#ifdef PHP_HTTP_HAVE_EVENT
ZEND_MOD_CONFLICTS("event")
#endif
#ifdef PHP_HTTP_HAVE_EVENT
ZEND_MOD_CONFLICTS("event")
#endif
@@
-149,10
+152,10
@@
PHP_MINIT_FUNCTION(http)
|| SUCCESS != PHP_MINIT_CALL(http_client_factory)
#if PHP_HTTP_HAVE_CURL
|| SUCCESS != PHP_MINIT_CALL(http_curl)
|| SUCCESS != PHP_MINIT_CALL(http_client_factory)
#if PHP_HTTP_HAVE_CURL
|| SUCCESS != PHP_MINIT_CALL(http_curl)
+ || SUCCESS != PHP_MINIT_CALL(http_curl_client)
+ || SUCCESS != PHP_MINIT_CALL(http_curl_client_pool)
+ || SUCCESS != PHP_MINIT_CALL(http_curl_client_datashare)
#endif
#endif
- || SUCCESS != PHP_MINIT_CALL(http_client_curl)
- || SUCCESS != PHP_MINIT_CALL(http_client_pool_curl)
- || SUCCESS != PHP_MINIT_CALL(http_client_datashare_curl)
|| SUCCESS != PHP_MINIT_CALL(http_url)
|| SUCCESS != PHP_MINIT_CALL(http_env)
|| SUCCESS != PHP_MINIT_CALL(http_env_request)
|| SUCCESS != PHP_MINIT_CALL(http_url)
|| SUCCESS != PHP_MINIT_CALL(http_env)
|| SUCCESS != PHP_MINIT_CALL(http_env_request)
@@
-190,7
+193,7
@@
PHP_RINIT_FUNCTION(http)
if (0
|| SUCCESS != PHP_RINIT_CALL(http_env)
#if PHP_HTTP_HAVE_CURL && PHP_HTTP_HAVE_EVENT
if (0
|| SUCCESS != PHP_RINIT_CALL(http_env)
#if PHP_HTTP_HAVE_CURL && PHP_HTTP_HAVE_EVENT
- || SUCCESS != PHP_RINIT_CALL(http_c
lient_pool_cur
l)
+ || SUCCESS != PHP_RINIT_CALL(http_c
url_client_poo
l)
#endif
) {
return FAILURE;
#endif
) {
return FAILURE;