From: Michael Wallner <mike@php.net>
Date: Sat, 16 Sep 2006 11:57:32 +0000 (+0000)
Subject: - enable dns data sharing for the global request datashare by default
X-Git-Tag: RELEASE_1_3_0~2
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=5b440d6af3dd3052dde7b137f975692f0aa84603;p=m6w6%2Fext-http

- enable dns data sharing for the global request datashare by default
- ensure request objects easy handle is initialized
- use curl_easy_strerror() for rc of curl_easy_setopt()
---

diff --git a/http.c b/http.c
index be8ccd7..b50682f 100644
--- a/http.c
+++ b/http.c
@@ -240,7 +240,7 @@ PHP_INI_BEGIN()
 	HTTP_PHP_INI_ENTRY("http.request.methods.custom", "", PHP_INI_PERDIR|PHP_INI_SYSTEM, OnUpdateString, request.methods.custom.ini)
 #if defined(ZEND_ENGINE_2) && defined(HTTP_HAVE_CURL)
 	HTTP_PHP_INI_ENTRY("http.request.datashare.cookie", "0", PHP_INI_SYSTEM, OnUpdateBool, request.datashare.cookie)
-	HTTP_PHP_INI_ENTRY("http.request.datashare.dns", "0", PHP_INI_SYSTEM, OnUpdateBool, request.datashare.dns)
+	HTTP_PHP_INI_ENTRY("http.request.datashare.dns", "1", PHP_INI_SYSTEM, OnUpdateBool, request.datashare.dns)
 	HTTP_PHP_INI_ENTRY("http.request.datashare.ssl", "0", PHP_INI_SYSTEM, OnUpdateBool, request.datashare.ssl)
 	HTTP_PHP_INI_ENTRY("http.request.datashare.connect", "0", PHP_INI_SYSTEM, OnUpdateBool, request.datashare.connect)
 #endif
diff --git a/http_request_datashare_api.c b/http_request_datashare_api.c
index 870e103..2bf0563 100644
--- a/http_request_datashare_api.c
+++ b/http_request_datashare_api.c
@@ -25,6 +25,9 @@
 #ifndef HAVE_CURL_SHARE_STRERROR
 #	define curl_share_strerror(dummy) "unknown error"
 #endif
+#ifndef HAVE_CURL_EASY_STRERROR
+#	define curl_easy_strerror(dummy) "unknown error"
+#endif
 
 static HashTable http_request_datashare_options;
 static http_request_datashare http_request_datashare_global;
@@ -130,8 +133,9 @@ PHP_HTTP_API STATUS _http_request_datashare_attach(http_request_datashare *share
 		}
 	}
 	
+	HTTP_CHECK_CURL_INIT(obj->request->ch, http_curl_init_ex(obj->request->ch, obj->request), return FAILURE);
 	if (CURLE_OK != (rc = curl_easy_setopt(obj->request->ch, CURLOPT_SHARE, share->ch))) {
-		http_error_ex(HE_WARNING, HTTP_E_REQUEST, "Could not attach HttpRequest object(#%d) to the HttpRequestDataShare: %s", Z_OBJ_HANDLE_P(request), curl_share_strerror(rc));
+		http_error_ex(HE_WARNING, HTTP_E_REQUEST, "Could not attach HttpRequest object(#%d) to the HttpRequestDataShare: %s", Z_OBJ_HANDLE_P(request), curl_easy_strerror(rc));
 		return FAILURE;
 	}