ditch libneon experiment; it's not a viable path for our usage pattern: handles are...

[m6w6/ext-http] / php_http.c

diff --git a/php_http.c b/php_http.c
index 1fc0513d3532c4926a4adabd65aee2302688fe04..36f2caa42b6a05dc9948939ff921430d6f53daa3 100644 (file)
--- a/php_http.c
+++ b/php_http.c
@@ -23,9 +23,6 @@
 #              include <event.h>
 #      endif
 #endif
-#if PHP_HTTP_HAVE_NEON
-#      include <neon/ne_utils.h>
-#endif
 #if PHP_HTTP_HAVE_SERF
 #      include <serf.h>
 #endif
@@ -151,9 +148,6 @@ PHP_MINIT_FUNCTION(http)
        || SUCCESS != PHP_MINIT_CALL(http_request)
 #if PHP_HTTP_HAVE_CURL
        || SUCCESS != PHP_MINIT_CALL(http_curl)
-#endif
-#if PHP_HTTP_HAVE_NEON
-       || SUCCESS != PHP_MINIT_CALL(http_neon)
 #endif
        || SUCCESS != PHP_MINIT_CALL(http_request_datashare)
        || SUCCESS != PHP_MINIT_CALL(http_request_method)
@@ -179,9 +173,6 @@ PHP_MSHUTDOWN_FUNCTION(http)
        || SUCCESS != PHP_MSHUTDOWN_CALL(http_message)
 #if PHP_HTTP_HAVE_CURL
        || SUCCESS != PHP_MSHUTDOWN_CALL(http_curl)
-#endif
-#if PHP_HTTP_HAVE_NEON
-       || SUCCESS != PHP_MSHUTDOWN_CALL(http_neon)
 #endif
        || SUCCESS != PHP_MSHUTDOWN_CALL(http_request_datashare)
        || SUCCESS != PHP_MSHUTDOWN_CALL(http_request_factory)
@@ -238,15 +229,6 @@ PHP_MINFO_FUNCTION(http)
 #else
        php_info_print_table_row(3, "libcurl", "disabled", "disabled");
 #endif
-#if PHP_HTTP_HAVE_NEON
-       {
-               char ne_v[16] = {0};
-               sscanf(ne_version_string(), "neon %15[^ :]", &ne_v[0]);
-               php_info_print_table_row(3, "libneon", PHP_HTTP_NEON_VERSION, ne_v);
-       }
-#else
-       php_info_print_table_row(3, "libneon", "disabled", "disabled");
-#endif
 
 #if PHP_HTTP_HAVE_EVENT
        php_info_print_table_row(3, "libevent", PHP_HTTP_EVENT_VERSION, event_get_version());