projects
/
m6w6
/
ext-http
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
2.0.0beta2
[m6w6/ext-http]
/
php_http.c
diff --git
a/php_http.c
b/php_http.c
index bba04c7b948bbb9f1f7385595a27b8707d7f682e..4eb0f5e9873817886702bae58603efe95932998e 100644
(file)
--- a/
php_http.c
+++ b/
php_http.c
@@
-152,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)
-#endif
|| SUCCESS != PHP_MINIT_CALL(http_curl_client)
|| SUCCESS != PHP_MINIT_CALL(http_curl_client_pool)
|| SUCCESS != PHP_MINIT_CALL(http_curl_client_datashare)
|| SUCCESS != PHP_MINIT_CALL(http_curl_client)
|| SUCCESS != PHP_MINIT_CALL(http_curl_client_pool)
|| SUCCESS != PHP_MINIT_CALL(http_curl_client_datashare)
+#endif
|| 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)
@@
-233,7
+233,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