From: Michael Wallner <mike@php.net>
Date: Sun, 6 Nov 2011 15:30:53 +0000 (+0000)
Subject: serf and new params parser
X-Git-Tag: DEV_2-before-client~83
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=7bdc434a56de6c8f3442e43c9bf8674245b0ee99;hp=a5bf469d59f8b88f00a8497599fd6388165af735;p=m6w6%2Fext-http

serf and new params parser
---

diff --git a/php_http.c b/php_http.c
index b71e6c2..9e97610 100644
--- 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 0cd759c..3ea3f3d 100644
--- 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"