X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_request_datashare_api.c;h=013ecac3585344c78fa510229b775703f8789a06;hp=870e103382f58c39c67f9f515d4d1de1697aaf6a;hb=6fb10f4eca75c9aa55500f6a11dede91baefd927;hpb=7ea5445a6250f29f09d6b97db124cacf457f23c5

diff --git a/http_request_datashare_api.c b/http_request_datashare_api.c
index 870e103..013ecac 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;
 	}
 	
@@ -219,10 +223,13 @@ static void http_request_datashare_destroy_handles(void *el)
 {
 	zval **r = (zval **) el;
 	TSRMLS_FETCH();
-	getObjectEx(http_request_object, obj, *r);
 	
-	curl_easy_setopt(obj->request->ch, CURLOPT_SHARE, NULL);
-	zval_ptr_dtor(r);
+	{ /* gcc 2.95 needs these braces */
+		getObjectEx(http_request_object, obj, *r);
+		
+		curl_easy_setopt(obj->request->ch, CURLOPT_SHARE, NULL);
+		zval_ptr_dtor(r);
+	}
 }
 
 #ifdef ZTS