X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_request_api.c;h=1b0c59e522a2120785601c222ab19c0d24664f13;hp=1d1252a0988399b783dd28089ec9f847246f4990;hb=930e15c0f50743465332dcf3e1036ff11ef2150e;hpb=04491f8ea81849ecb509b96c480ffe6f00d0cfd4

diff --git a/http_request_api.c b/http_request_api.c
index 1d1252a..1b0c59e 100644
--- a/http_request_api.c
+++ b/http_request_api.c
@@ -6,7 +6,7 @@
     | modification, are permitted provided that the conditions mentioned |
     | in the accompanying LICENSE file are met.                          |
     +--------------------------------------------------------------------+
-    | Copyright (c) 2004-2007, Michael Wallner <mike@php.net>            |
+    | Copyright (c) 2004-2010, Michael Wallner <mike@php.net>            |
     +--------------------------------------------------------------------+
 */
 
@@ -478,8 +478,10 @@ PHP_HTTP_API void _http_request_defaults(http_request *request)
 		HTTP_CURL_OPT(CURLOPT_PROXYPORT, 0L);
 		HTTP_CURL_OPT(CURLOPT_PROXYTYPE, 0L);
 		/* libcurl < 7.19.6 does not clear auth info with USERPWD set to NULL */
+#if HTTP_CURL_VERSION(7,19,1)		
 		HTTP_CURL_OPT(CURLOPT_PROXYUSERNAME, NULL);
 		HTTP_CURL_OPT(CURLOPT_PROXYPASSWORD, NULL);
+#endif
 		HTTP_CURL_OPT(CURLOPT_PROXYAUTH, 0L);
 		HTTP_CURL_OPT(CURLOPT_HTTPPROXYTUNNEL, 0L);
 		HTTP_CURL_OPT(CURLOPT_DNS_CACHE_TIMEOUT, 60L);
@@ -506,8 +508,10 @@ PHP_HTTP_API void _http_request_defaults(http_request *request)
 		HTTP_CURL_OPT(CURLOPT_LOCALPORTRANGE, 0L);
 #endif
 		/* libcurl < 7.19.6 does not clear auth info with USERPWD set to NULL */
+#if HTTP_CURL_VERSION(7,19,1)
 		HTTP_CURL_OPT(CURLOPT_USERNAME, NULL);
 		HTTP_CURL_OPT(CURLOPT_PASSWORD, NULL);
+#endif
 		HTTP_CURL_OPT(CURLOPT_HTTPAUTH, 0L);
 		HTTP_CURL_OPT(CURLOPT_ENCODING, NULL);
 #if HTTP_CURL_VERSION(7,16,2)
@@ -527,8 +531,9 @@ PHP_HTTP_API void _http_request_defaults(http_request *request)
 		HTTP_CURL_OPT(CURLOPT_HTTPHEADER, NULL);
 		HTTP_CURL_OPT(CURLOPT_COOKIE, NULL);
 		HTTP_CURL_OPT(CURLOPT_COOKIESESSION, 0L);
+		/* these options would enable curl's cookie engine by default which we don't want
 		HTTP_CURL_OPT(CURLOPT_COOKIEFILE, NULL);
-		HTTP_CURL_OPT(CURLOPT_COOKIEJAR, NULL);
+		HTTP_CURL_OPT(CURLOPT_COOKIEJAR, NULL); */
 #if HTTP_CURL_VERSION(7,14,1)
 		HTTP_CURL_OPT(CURLOPT_COOKIELIST, NULL);
 #endif
@@ -610,7 +615,10 @@ PHP_HTTP_API STATUS _http_request_prepare(http_request *request, HashTable *opti
 	TSRMLS_FETCH_FROM_CTX(request->tsrm_ls);
 	
 	HTTP_CHECK_CURL_INIT(request->ch, http_curl_init(request), return FAILURE);
-	
+
+	if (!request->url) {
+		return FAILURE;
+	}
 	if (!(storage = http_request_storage_get(request->ch))) {
 		return FAILURE;
 	}
@@ -841,31 +849,37 @@ PHP_HTTP_API STATUS _http_request_prepare(http_request *request, HashTable *opti
 		HashKey header_key = initHashKey(0);
 		zval **header_val;
 		HashPosition pos;
-
+		phpstr header;
+		
+		phpstr_init(&header);
 		FOREACH_KEYVAL(pos, zoption, header_key, header_val) {
 			if (header_key.type == HASH_KEY_IS_STRING) {
-				char header[1024];
 				zval *header_cpy = http_zsep(IS_STRING, *header_val);
 				
 				if (!strcasecmp(header_key.str, "range")) {
 					range_req = 1;
 				}
-				snprintf(header, sizeof(header), "%s: %s", header_key.str, Z_STRVAL_P(header_cpy));
-				request->_cache.headers = curl_slist_append(request->_cache.headers, header);
+
+				phpstr_appendf(&header, "%s: %s", header_key.str, Z_STRVAL_P(header_cpy));
+				phpstr_fix(&header);
+				request->_cache.headers = curl_slist_append(request->_cache.headers, PHPSTR_VAL(&header));
+				phpstr_reset(&header);
+				
 				zval_ptr_dtor(&header_cpy);
 			}
 		}
+		phpstr_dtor(&header);
 	}
 	/* etag */
 	if ((zoption = http_request_option(request, options, "etag", IS_STRING)) && Z_STRLEN_P(zoption)) {
-		char match_header[1024], *quoted_etag = NULL;
+		zend_bool is_quoted = !((Z_STRVAL_P(zoption)[0] != '"') || (Z_STRVAL_P(zoption)[Z_STRLEN_P(zoption)-1] != '"'));
+		phpstr header;
 		
-		if ((Z_STRVAL_P(zoption)[0] != '"') || (Z_STRVAL_P(zoption)[Z_STRLEN_P(zoption)-1] != '"')) {
-			spprintf(&quoted_etag, 0, "\"%s\"", Z_STRVAL_P(zoption));
-		}
-		snprintf(match_header, sizeof(match_header), "%s: %s", range_req?"If-Match":"If-None-Match", quoted_etag?quoted_etag:Z_STRVAL_P(zoption));
-		request->_cache.headers = curl_slist_append(request->_cache.headers, match_header);
-		STR_FREE(quoted_etag);
+		phpstr_init(&header);
+		phpstr_appendf(&header, is_quoted?"%s: %s":"%s: \"%s\"", range_req?"If-Match":"If-None-Match", Z_STRVAL_P(zoption));
+		phpstr_fix(&header);
+		request->_cache.headers = curl_slist_append(request->_cache.headers, PHPSTR_VAL(&header));
+		phpstr_dtor(&header);
 	}
 	/* compression */
 	if ((zoption = http_request_option(request, options, "compress", IS_BOOL)) && Z_LVAL_P(zoption)) {
@@ -1080,6 +1094,11 @@ PHP_HTTP_API void _http_request_exec(http_request *request)
 retry:
 	if (CURLE_OK != (result = curl_easy_perform(request->ch))) {
 		http_error_ex(HE_WARNING, HTTP_E_REQUEST, "%s; %s (%s)", curl_easy_strerror(result), http_request_storage_get(request->ch)->errorbuffer, request->url);
+#ifdef ZEND_ENGINE_2
+		if ((HTTP_G->only_exceptions || GLOBAL_ERROR_HANDLING == EH_THROW) && EG(exception)) {
+			add_property_long(EG(exception), "curlCode", result);
+		}
+#endif
 		
 		if (request->_retry.count > tries++) {
 			switch (result) {