X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=php_http.c;h=889cb09a46d1310f1e0c34ab33d36e6103da49f2;hp=fb49548a7ce8a9d19a2a3179ed77fb733d277a9c;hb=4407379af8d886b627c88572e9da69c38cdbda58;hpb=4743c5114bcdcf8d478e140beb63fecfeccd01a4

diff --git a/php_http.c b/php_http.c
index fb49548..889cb09 100644
--- a/php_http.c
+++ b/php_http.c
@@ -6,29 +6,27 @@
     | modification, are permitted provided that the conditions mentioned |
     | in the accompanying LICENSE file are met.                          |
     +--------------------------------------------------------------------+
-    | Copyright (c) 2004-2010, Michael Wallner <mike@php.net>            |
+    | Copyright (c) 2004-2011, Michael Wallner <mike@php.net>            |
     +--------------------------------------------------------------------+
 */
 
-/* $Id: http.c 300300 2010-06-09 07:29:35Z mike $ */
+#include "php_http_api.h"
 
-#include "php_http.h"
+#include <php_ini.h>
+#include <ext/standard/info.h>
 
 #include <zlib.h>
-#ifdef PHP_HTTP_HAVE_CURL
+
+#if PHP_HTTP_HAVE_CURL
 #	include <curl/curl.h>
-#	ifdef PHP_HTTP_HAVE_EVENT
+#	if PHP_HTTP_HAVE_EVENT
 #		include <event.h>
 #	endif
 #endif
-#ifdef PHP_HTTP_HAVE_NEON
-#	include "neon/ne_utils.h"
+#if PHP_HTTP_HAVE_SERF
+#	include <serf.h>
 #endif
 
-#include <main/php_ini.h>
-#include <ext/standard/info.h>
-#include <Zend/zend_extensions.h>
-
 ZEND_DECLARE_MODULE_GLOBALS(php_http);
 
 #ifdef COMPILE_DL_HTTP
@@ -120,7 +118,7 @@ zend_php_http_globals *php_http_globals(void)
 #endif
 #endif
 PHP_INI_BEGIN()
-	PHP_HTTP_INI_ENTRY("http.etag.mode", "md5", PHP_INI_ALL, OnUpdateString, env.etag_mode)
+	PHP_HTTP_INI_ENTRY("http.etag.mode", "crc32b", PHP_INI_ALL, OnUpdateString, env.etag_mode)
 	PHP_HTTP_INI_ENTRY("http.request_datashare.cookie", "0", PHP_INI_SYSTEM, OnUpdateBool, request_datashare.cookie)
 	PHP_HTTP_INI_ENTRY("http.request_datashare.dns", "1", PHP_INI_SYSTEM, OnUpdateBool, request_datashare.dns)
 	PHP_HTTP_INI_ENTRY("http.request_datashare.ssl", "0", PHP_INI_SYSTEM, OnUpdateBool, request_datashare.ssl)
@@ -141,20 +139,23 @@ 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)
 	|| SUCCESS != PHP_MINIT_CALL(http_querystring)
 	|| SUCCESS != PHP_MINIT_CALL(http_request_factory)
 	|| SUCCESS != PHP_MINIT_CALL(http_request)
+#if PHP_HTTP_HAVE_CURL
 	|| SUCCESS != PHP_MINIT_CALL(http_curl)
-	|| SUCCESS != PHP_MINIT_CALL(http_neon)
+#endif
 	|| SUCCESS != PHP_MINIT_CALL(http_request_datashare)
 	|| SUCCESS != PHP_MINIT_CALL(http_request_method)
 	|| SUCCESS != PHP_MINIT_CALL(http_request_pool)
 	|| 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;
 	}
@@ -170,8 +171,9 @@ PHP_MSHUTDOWN_FUNCTION(http)
 	
 	if (0
 	|| SUCCESS != PHP_MSHUTDOWN_CALL(http_message)
+#if PHP_HTTP_HAVE_CURL
 	|| SUCCESS != PHP_MSHUTDOWN_CALL(http_curl)
-	|| SUCCESS != PHP_MSHUTDOWN_CALL(http_neon)
+#endif
 	|| SUCCESS != PHP_MSHUTDOWN_CALL(http_request_datashare)
 	|| SUCCESS != PHP_MSHUTDOWN_CALL(http_request_factory)
 	|| SUCCESS != PHP_MSHUTDOWN_CALL(http_persistent_handle)
@@ -187,7 +189,9 @@ PHP_RINIT_FUNCTION(http)
 	if (0
 	|| SUCCESS != PHP_RINIT_CALL(http_env)
 	|| SUCCESS != PHP_RINIT_CALL(http_request_datashare)
+#if PHP_HTTP_HAVE_CURL
 	|| SUCCESS != PHP_RINIT_CALL(http_curl)
+#endif
 	) {
 		return FAILURE;
 	}
@@ -217,7 +221,7 @@ PHP_MINFO_FUNCTION(http)
 	php_info_print_table_start();
 	php_info_print_table_header(3, "Used Library", "Compiled", "Linked");
 	php_info_print_table_row(3, "libz", ZLIB_VERSION, zlibVersion());
-#ifdef PHP_HTTP_HAVE_CURL
+#if PHP_HTTP_HAVE_CURL
 	{
 		curl_version_info_data *cv = curl_version_info(CURLVERSION_NOW);
 		php_info_print_table_row(3, "libcurl", LIBCURL_VERSION, cv->version);
@@ -225,21 +229,25 @@ PHP_MINFO_FUNCTION(http)
 #else
 	php_info_print_table_row(3, "libcurl", "disabled", "disabled");
 #endif
-#ifdef 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
 
-#ifdef PHP_HTTP_HAVE_EVENT
+#if PHP_HTTP_HAVE_EVENT
 	php_info_print_table_row(3, "libevent", PHP_HTTP_EVENT_VERSION, event_get_version());
 #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();