serf and new params parser

diff --git a/php_http.c b/php_http.c
index b71e6c26115722c305634811dbe31ef5909a1d96..9e976106ab79df29fe833683b4af41c0e722e84a 100644 (file)
--- a/php_http.c
+++ b/php_http.c
@@ -142,6 +142,7 @@ PHP_MINIT_FUNCTION(http)
        || SUCCESS != PHP_MINIT_CALL(http_cookie)
        || SUCCESS != PHP_MINIT_CALL(http_encoding)
        || SUCCESS != PHP_MINIT_CALL(http_filter)
+       || SUCCESS != PHP_MINIT_CALL(http_header)
        || SUCCESS != PHP_MINIT_CALL(http_message)
        || SUCCESS != PHP_MINIT_CALL(http_message_body)
        || SUCCESS != PHP_MINIT_CALL(http_property_proxy)
@@ -160,6 +161,7 @@ PHP_MINIT_FUNCTION(http)
        || SUCCESS != PHP_MINIT_CALL(http_url)
        || SUCCESS != PHP_MINIT_CALL(http_env)
        || SUCCESS != PHP_MINIT_CALL(http_env_response)
+       || SUCCESS != PHP_MINIT_CALL(http_params)
        ) {
                return FAILURE;
        }
@@ -251,6 +253,19 @@ PHP_MINFO_FUNCTION(http)
 #else
        php_info_print_table_row(3, "libevent", "disabled", "disabled");
 #endif
+
+#if PHP_HTTP_HAVE_SERF
+       {
+               int v[3];
+               char sl_v[16] = {0};
+
+               serf_lib_version(&v[0], &v[1], &v[2]);
+               slprintf(sl_v, lenof(sl_v), "%d.%d.%d", v[0], v[1], v[2]);
+               php_info_print_table_row(3, "libserf", SERF_VERSION_STRING, sl_v);
+       }
+#else
+       php_info_print_table_row(3, "libserf", "disabled", "disabled");
+#endif
        php_info_print_table_end();
        
        php_info_print_table_start();

diff --git a/php_http.h b/php_http.h
index 0cd759cf18302bf76a38f2bc2efaf8dfe58ed662..3ea3f3da47db3b2b2c66c2e573cdaf69f7bc0d79 100644 (file)
--- a/php_http.h
+++ b/php_http.h
@@ -107,6 +107,7 @@ extern void _dpf(int type, const char *data, size_t length);
 #include "php_http_request.h"
 #include "php_http_curl.h"
 #include "php_http_neon.h"
+#include "php_http_serf.h"
 #include "php_http_request_method.h"
 #include "php_http_request_pool.h"
 #include "php_http_url.h"