X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_request_api.c;h=728fe3f2357a65cfb008e720b16d4a75ffc0f9f2;hp=3396dba1d080f77e3488d920122a3caba0d1f4ef;hb=8f353a932432afe5f0404e335a7f599a183ca678;hpb=1df42dae0279a4d0f98b042bb389e90cbd197f6f

diff --git a/http_request_api.c b/http_request_api.c
index 3396dba..728fe3f 100644
--- a/http_request_api.c
+++ b/http_request_api.c
@@ -19,11 +19,9 @@
 #ifdef HTTP_HAVE_CURL
 
 #include "php_http_api.h"
+#include "php_http_persistent_handle_api.h"
 #include "php_http_request_api.h"
 #include "php_http_url_api.h"
-#ifdef HTTP_HAVE_PERSISTENT_HANDLES
-#	include "php_http_persistent_handle_api.h"
-#endif
 
 #ifdef ZEND_ENGINE_2
 #	include "php_http_request_object.h"
@@ -86,6 +84,51 @@ static struct gcry_thread_cbs http_gnutls_tsl = {
 #endif
 /* }}} */
 
+/* safe curl wrappers */
+#define init_curl_storage(ch) \
+	{\
+		http_request_storage *st = pecalloc(1, sizeof(http_request_storage), 1); \
+		curl_easy_setopt(ch, CURLOPT_PRIVATE, st); \
+		curl_easy_setopt(ch, CURLOPT_ERRORBUFFER, st->errorbuffer); \
+	}
+
+static void *safe_curl_init(void)
+{
+	CURL *ch;
+	
+	if ((ch = curl_easy_init())) {
+		init_curl_storage(ch);
+		return ch;
+	}
+	return NULL;
+}
+static void *safe_curl_copy(void *p)
+{
+	CURL *ch;
+	
+	if ((ch = curl_easy_duphandle(p))) {
+		init_curl_storage(ch);
+		return ch;
+	}
+	return NULL;
+}
+static void safe_curl_dtor(void *p) {
+	http_request_storage *st = http_request_storage_get(p);
+	
+	curl_easy_cleanup(p);
+	
+	if (st) {
+		if (st->url) {
+			pefree(st->url, 1);
+		}
+		if (st->cookiestore) {
+			pefree(st->cookiestore, 1);
+		}
+		pefree(st, 1);
+	}
+}
+/* }}} */
+
 /* {{{ MINIT */
 PHP_MINIT_FUNCTION(http_request)
 {
@@ -112,11 +155,9 @@ PHP_MINIT_FUNCTION(http_request)
 		return FAILURE;
 	}
 	
-#ifdef HTTP_HAVE_PERSISTENT_HANDLES
-	if (SUCCESS != http_persistent_handle_provide("http_request", curl_easy_init, curl_easy_cleanup)) {
+	if (SUCCESS != http_persistent_handle_provide("http_request", safe_curl_init, safe_curl_dtor, safe_curl_copy)) {
 		return FAILURE;
 	}
-#endif
 	
 	HTTP_LONG_CONSTANT("HTTP_AUTH_BASIC", CURLAUTH_BASIC);
 	HTTP_LONG_CONSTANT("HTTP_AUTH_DIGEST", CURLAUTH_DIGEST);
@@ -185,18 +226,10 @@ static int http_curl_dummy_callback(char *data, size_t n, size_t l, void *s) { r
 static curlioerr http_curl_ioctl_callback(CURL *, curliocmd, void *);
 /* }}} */
 
-#ifdef HTTP_HAVE_PERSISTENT_HANDLES
-#	define HTTP_CURL_HANDLE_CTOR(ch) (SUCCESS == http_persistent_handle_acquire("http_request", &(ch)))
-#	define HTTP_CURL_HANDLE_DTOR(chp) http_persistent_handle_release("http_request", (chp))
-#else
-#	define HTTP_CURL_HANDLE_CTOR(ch) ((ch) = curl_easy_init())
-#	define HTTP_CURL_HANDLE_DTOR(chp) curl_easy_cleanup(*(chp)); *(chp) = NULL
-#endif
-
 /* {{{ CURL *http_curl_init(http_request *) */
 PHP_HTTP_API CURL * _http_curl_init_ex(CURL *ch, http_request *request TSRMLS_DC)
 {
-	if (ch || HTTP_CURL_HANDLE_CTOR(ch)) {
+	if (ch || (SUCCESS == http_persistent_handle_acquire("http_request", &ch))) {
 #if defined(ZTS)
 		curl_easy_setopt(ch, CURLOPT_NOSIGNAL, 1L);
 #endif
@@ -212,9 +245,7 @@ PHP_HTTP_API CURL * _http_curl_init_ex(CURL *ch, http_request *request TSRMLS_DC
 		
 		/* set context */
 		if (request) {
-			curl_easy_setopt(ch, CURLOPT_PRIVATE, request);
 			curl_easy_setopt(ch, CURLOPT_DEBUGDATA, request);
-			curl_easy_setopt(ch, CURLOPT_ERRORBUFFER, request->_error);
 			
 			/* attach curl handle */
 			request->ch = ch;
@@ -227,6 +258,18 @@ PHP_HTTP_API CURL * _http_curl_init_ex(CURL *ch, http_request *request TSRMLS_DC
 }
 /* }}} */
 
+/* {{{ CURL *http_curl_copy(CURL *) */
+PHP_HTTP_API CURL *_http_curl_copy(CURL *ch TSRMLS_DC)
+{
+	CURL *copy;
+	
+	if (SUCCESS == http_persistent_handle_accrete("http_request", ch, &copy)) {
+		return copy;
+	}
+	return NULL;
+}
+/* }}} */
+
 /* {{{ void http_curl_free(CURL **) */
 PHP_HTTP_API void _http_curl_free(CURL **ch TSRMLS_DC)
 {
@@ -236,7 +279,7 @@ PHP_HTTP_API void _http_curl_free(CURL **ch TSRMLS_DC)
 		curl_easy_setopt(*ch, CURLOPT_VERBOSE, 0L);
 		curl_easy_setopt(*ch, CURLOPT_DEBUGFUNCTION, NULL);
 		
-		HTTP_CURL_HANDLE_DTOR(ch);
+		http_persistent_handle_release("http_request", ch);
 	}
 }
 /* }}} */
@@ -311,11 +354,23 @@ PHP_HTTP_API void _http_request_reset(http_request *request)
 	phpstr_dtor(&request->conv.request);
 	phpstr_dtor(&request->conv.response);
 	http_request_body_dtor(request->body);
+	http_request_defaults(request);
 	
 	if (request->ch) {
-		http_request_defaults(request);
+		http_request_storage *st = http_request_storage_get(request->ch);
+		
+		if (st) {
+			if (st->url) {
+				pefree(st->url, 1);
+				st->url = NULL;
+			}
+			if (st->cookiestore) {
+				pefree(st->cookiestore, 1);
+				st->cookiestore = NULL;
+			}
+			st->errorbuffer[0] = '\0';
+		}
 	}
-	request->_error[0] = '\0';
 }
 /* }}} */
 
@@ -346,20 +401,38 @@ PHP_HTTP_API STATUS _http_request_reset_cookies(http_request *request, int sessi
 		if (initialized && CURLE_OK == curl_easy_setopt(request->ch, CURLOPT_COOKIELIST, "SESS")) {
 			return SUCCESS;
 		}
-#endif
+#else
 		http_error(HE_WARNING, HTTP_E_REQUEST, "Could not reset session cookies (need libcurl >= v7.15.4)");
+#endif
 	} else {
 #if HTTP_CURL_VERSION(7,14,1)
 		if (initialized && CURLE_OK == curl_easy_setopt(request->ch, CURLOPT_COOKIELIST, "ALL")) {
 			return SUCCESS;
 		}
-#endif
+#else
 		http_error(HE_WARNING, HTTP_E_REQUEST, "Could not reset cookies (need libcurl >= v7.14.1)");
+#endif
 	}
 	return FAILURE;
 }
 /* }}} */
 
+PHP_HTTP_API STATUS _http_request_flush_cookies(http_request *request)
+{
+	int initialized = 1;
+	TSRMLS_FETCH_FROM_CTX(request->tsrm_ls);
+	
+	HTTP_CHECK_CURL_INIT(request->ch, http_curl_init_ex(request->ch, request), initialized = 0);
+#if HTTP_CURL_VERSION(7,17,1)
+	if (initialized && CURLE_OK == curl_easy_setopt(request->ch, CURLOPT_COOKIELIST, "FLUSH")) {
+		return SUCCESS;
+	}
+#else
+	http_error(HE_WARNING, HTTP_E_REQUEST, "Could not flush cookies (need libcurl >= v7.17.1)");
+#endif
+	return FAILURE;
+}
+
 /* {{{ void http_request_defaults(http_request *) */
 PHP_HTTP_API void _http_request_defaults(http_request *request)
 {
@@ -377,8 +450,10 @@ PHP_HTTP_API void _http_request_defaults(http_request *request)
 		HTTP_CURL_OPT(CURLOPT_LOW_SPEED_LIMIT, 0L);
 		HTTP_CURL_OPT(CURLOPT_LOW_SPEED_TIME, 0L);
 #if HTTP_CURL_VERSION(7,15,5)
+		/* LFS weirdance
 		HTTP_CURL_OPT(CURLOPT_MAX_SEND_SPEED_LARGE, (curl_off_t) 0);
 		HTTP_CURL_OPT(CURLOPT_MAX_RECV_SPEED_LARGE, (curl_off_t) 0);
+		*/
 #endif
 		/* crashes
 		HTTP_CURL_OPT(CURLOPT_MAXCONNECTS, 5L); */
@@ -393,6 +468,11 @@ PHP_HTTP_API void _http_request_defaults(http_request *request)
 		HTTP_CURL_OPT(CURLOPT_USERPWD, NULL);
 		HTTP_CURL_OPT(CURLOPT_HTTPAUTH, 0L);
 		HTTP_CURL_OPT(CURLOPT_ENCODING, NULL);
+#if HTTP_CURL_VERSION(7,16,2)
+		/* we do this ourself anyway */
+		HTTP_CURL_OPT(CURLOPT_HTTP_CONTENT_DECODING, 0L);
+		HTTP_CURL_OPT(CURLOPT_HTTP_TRANSFER_DECODING, 0L);
+#endif
 		HTTP_CURL_OPT(CURLOPT_FOLLOWLOCATION, 0L);
 		HTTP_CURL_OPT(CURLOPT_UNRESTRICTED_AUTH, 0L);
 		HTTP_CURL_OPT(CURLOPT_REFERER, NULL);
@@ -466,13 +546,22 @@ PHP_HTTP_API STATUS _http_request_prepare(http_request *request, HashTable *opti
 {
 	zval *zoption;
 	zend_bool range_req = 0;
+	http_request_storage *storage;
 
 	TSRMLS_FETCH_FROM_CTX(request->tsrm_ls);
 	
 	HTTP_CHECK_CURL_INIT(request->ch, http_curl_init(request), return FAILURE);
 	
+	if (!(storage = http_request_storage_get(request->ch))) {
+		return FAILURE;
+	}
+	
 	/* set options */
-	HTTP_CURL_OPT(CURLOPT_URL, request->url);
+	if (storage->url) {
+		pefree(storage->url, 1);
+	}
+	storage->url = pestrdup(request->url, 1);
+	HTTP_CURL_OPT(CURLOPT_URL, storage->url);
 
 	/* progress callback */
 	if ((zoption = http_request_option(request, options, "onprogress", -1))) {
@@ -481,9 +570,7 @@ PHP_HTTP_API STATUS _http_request_prepare(http_request *request, HashTable *opti
 
 	/* proxy */
 	if ((zoption = http_request_option(request, options, "proxyhost", IS_STRING))) {
-		if (Z_STRLEN_P(zoption)) {
-			HTTP_CURL_OPT(CURLOPT_PROXY, Z_STRVAL_P(zoption));
-		}
+		HTTP_CURL_OPT(CURLOPT_PROXY, Z_STRVAL_P(zoption));
 		/* type */
 		if ((zoption = http_request_option(request, options, "proxytype", IS_LONG))) {
 			HTTP_CURL_OPT(CURLOPT_PROXYTYPE, Z_LVAL_P(zoption));
@@ -518,12 +605,14 @@ PHP_HTTP_API STATUS _http_request_prepare(http_request *request, HashTable *opti
 		HTTP_CURL_OPT(CURLOPT_LOW_SPEED_TIME, Z_LVAL_P(zoption));
 	}
 #if HTTP_CURL_VERSION(7,15,5)
+	/* LSF weirdance
 	if ((zoption = http_request_option(request, options, "max_send_speed", IS_LONG))) {
 		HTTP_CURL_OPT(CURLOPT_MAX_SEND_SPEED_LARGE, (curl_off_t) Z_LVAL_P(zoption));
 	}
 	if ((zoption = http_request_option(request, options, "max_recv_speed", IS_LONG))) {
 		HTTP_CURL_OPT(CURLOPT_MAX_RECV_SPEED_LARGE, (curl_off_t) Z_LVAL_P(zoption));
 	}
+	*/
 #endif
 	/* crashes
 	if ((zoption = http_request_option(request, options, "maxconnects", IS_LONG))) {
@@ -583,6 +672,18 @@ PHP_HTTP_API STATUS _http_request_prepare(http_request *request, HashTable *opti
 			HTTP_CURL_OPT(CURLOPT_UNRESTRICTED_AUTH, Z_LVAL_P(zoption));
 		}
 	}
+	
+	/* retries, defaults to 0 */
+	if ((zoption = http_request_option(request, options, "retrycount", IS_LONG))) {
+		request->_retry.count = Z_LVAL_P(zoption);
+		if ((zoption = http_request_option(request, options, "retrydelay", IS_DOUBLE))) {
+			request->_retry.delay = Z_DVAL_P(zoption);
+		} else {
+			request->_retry.delay = 0;
+		}
+	} else {
+		request->_retry.count = 0;
+	}
 
 	/* referer */
 	if ((zoption = http_request_option(request, options, "referer", IS_STRING)) && Z_STRLEN_P(zoption)) {
@@ -743,8 +844,12 @@ PHP_HTTP_API STATUS _http_request_prepare(http_request *request, HashTable *opti
 		if (Z_STRLEN_P(zoption)) {
 			HTTP_CHECK_OPEN_BASEDIR(Z_STRVAL_P(zoption), return FAILURE);
 		}
-		HTTP_CURL_OPT(CURLOPT_COOKIEFILE, Z_STRVAL_P(zoption));
-		HTTP_CURL_OPT(CURLOPT_COOKIEJAR, Z_STRVAL_P(zoption));
+		if (storage->cookiestore) {
+			pefree(storage->cookiestore, 1);
+		}
+		storage->cookiestore = pestrndup(Z_STRVAL_P(zoption), Z_STRLEN_P(zoption), 1);
+		HTTP_CURL_OPT(CURLOPT_COOKIEFILE, storage->cookiestore);
+		HTTP_CURL_OPT(CURLOPT_COOKIEJAR, storage->cookiestore);
 	}
 
 	/* maxfilesize */
@@ -874,11 +979,37 @@ PHP_HTTP_API STATUS _http_request_prepare(http_request *request, HashTable *opti
 /* {{{ void http_request_exec(http_request *) */
 PHP_HTTP_API void _http_request_exec(http_request *request)
 {
+	uint tries = 0;
 	CURLcode result;
 	TSRMLS_FETCH_FROM_CTX(request->tsrm_ls);
 	
+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), request->_error, request->url);
+		http_error_ex(HE_WARNING, HTTP_E_REQUEST, "%s; %s (%s)", curl_easy_strerror(result), http_request_storage_get(request->ch)->errorbuffer, request->url);
+		
+		if (request->_retry.count > tries++) {
+			switch (result) {
+				case CURLE_COULDNT_RESOLVE_PROXY:
+				case CURLE_COULDNT_RESOLVE_HOST:
+				case CURLE_COULDNT_CONNECT:
+				case CURLE_WRITE_ERROR:
+				case CURLE_READ_ERROR:
+				case CURLE_OPERATION_TIMEDOUT:
+				case CURLE_SSL_CONNECT_ERROR:
+				case CURLE_GOT_NOTHING:
+				case CURLE_SSL_ENGINE_SETFAILED:
+				case CURLE_SEND_ERROR:
+				case CURLE_RECV_ERROR:
+				case CURLE_SSL_ENGINE_INITFAILED:
+				case CURLE_LOGIN_DENIED:
+					if (request->_retry.delay >= HTTP_DIFFSEC) {
+						http_sleep(request->_retry.delay);
+					}
+					goto retry;
+				default:
+					break;
+			}
+		}
 	}
 }
 /* }}} */