projects
/
m6w6
/
ext-http
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
change array_list API
[m6w6/ext-http]
/
php_http.c
diff --git
a/php_http.c
b/php_http.c
index f4b7394ce3591f7920df53c0da4e8d9e892f525c..06ec91520c2874c08b31afd661cb15128f83a1df 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
@@
-146,12
+149,13
@@
PHP_MINIT_FUNCTION(http)
|| SUCCESS != PHP_MINIT_CALL(http_client_response)
|| SUCCESS != PHP_MINIT_CALL(http_client_datashare)
|| SUCCESS != PHP_MINIT_CALL(http_client_pool)
|| SUCCESS != PHP_MINIT_CALL(http_client_response)
|| SUCCESS != PHP_MINIT_CALL(http_client_datashare)
|| SUCCESS != PHP_MINIT_CALL(http_client_pool)
+ || SUCCESS != PHP_MINIT_CALL(http_client_factory)
#if PHP_HTTP_HAVE_CURL
|| SUCCESS != PHP_MINIT_CALL(http_curl)
#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)
@@
-173,9
+177,11
@@
PHP_MSHUTDOWN_FUNCTION(http)
if (0
|| SUCCESS != PHP_MSHUTDOWN_CALL(http_message)
#if PHP_HTTP_HAVE_CURL
if (0
|| SUCCESS != PHP_MSHUTDOWN_CALL(http_message)
#if PHP_HTTP_HAVE_CURL
+ || SUCCESS != PHP_MSHUTDOWN_CALL(http_curl_client)
|| SUCCESS != PHP_MSHUTDOWN_CALL(http_curl)
#endif
|| SUCCESS != PHP_MSHUTDOWN_CALL(http_persistent_handle)
|| SUCCESS != PHP_MSHUTDOWN_CALL(http_curl)
#endif
|| SUCCESS != PHP_MSHUTDOWN_CALL(http_persistent_handle)
+ || SUCCESS != PHP_MSHUTDOWN_CALL(http_client_factory)
) {
return FAILURE;
}
) {
return FAILURE;
}
@@
-188,7
+194,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;
@@
-200,6
+206,9
@@
PHP_RINIT_FUNCTION(http)
PHP_RSHUTDOWN_FUNCTION(http)
{
if (0
PHP_RSHUTDOWN_FUNCTION(http)
{
if (0
+#if PHP_HTTP_HAVE_CURL && PHP_HTTP_HAVE_EVENT
+ || SUCCESS != PHP_RSHUTDOWN_CALL(http_curl_client_pool)
+#endif
|| SUCCESS != PHP_RSHUTDOWN_CALL(http_env)
) {
return FAILURE;
|| SUCCESS != PHP_RSHUTDOWN_CALL(http_env)
) {
return FAILURE;
@@
-228,7
+237,13
@@
PHP_MINFO_FUNCTION(http)
#endif
#if PHP_HTTP_HAVE_EVENT
#endif
#if PHP_HTTP_HAVE_EVENT
- php_info_print_table_row(3, "libevent", PHP_HTTP_EVENT_VERSION, event_get_version());
+ php_info_print_table_row(3, "libevent",
+# ifdef LIBEVENT_VERSION
+ LIBEVENT_VERSION,
+# else
+ PHP_HTTP_EVENT_VERSION,
+# endif
+ event_get_version());
#else
php_info_print_table_row(3, "libevent", "disabled", "disabled");
#endif
#else
php_info_print_table_row(3, "libevent", "disabled", "disabled");
#endif