X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=php_http_client_curl.c;h=37f255b733d7ed3a2fd8c6cd8564dfa15c5c3e0e;hp=1e6d6678fb97c7e36de82223cb4cc1718bccd448;hb=976b54c3817a2a1f6cc86077a6a5116a0b8f8b18;hpb=4a0658681a1fdc589a2193394b2642c034ef1bef

diff --git a/php_http_client_curl.c b/php_http_client_curl.c
index 1e6d667..37f255b 100644
--- a/php_http_client_curl.c
+++ b/php_http_client_curl.c
@@ -98,6 +98,7 @@ typedef struct php_http_client_curl_handler {
 typedef struct php_http_curle_storage {
 	char *url;
 	char *cookiestore;
+	CURLcode errorcode;
 	char errorbuffer[0x100];
 } php_http_curle_storage_t;
 
@@ -487,7 +488,6 @@ static STATUS php_http_curle_get_info(CURL *ch, HashTable *info)
 
 #if PHP_HTTP_CURL_VERSION(7,34,0)
 	{
-		int i;
 		zval *ti_array;
 		struct curl_tlssessioninfo *ti;
 
@@ -599,7 +599,12 @@ static STATUS php_http_curle_get_info(CURL *ch, HashTable *info)
 		}
 	}
 #endif
-	add_assoc_string_ex(&array, "error", sizeof("error"), php_http_curle_get_storage(ch)->errorbuffer, 1);
+	{
+		php_http_curle_storage_t *st = php_http_curle_get_storage(ch);
+
+		add_assoc_long_ex(&array, "curlcode", sizeof("curlcode"), st->errorcode);
+		add_assoc_string_ex(&array, "error", sizeof("error"), st->errorbuffer, 1);
+	}
 
 	return SUCCESS;
 }
@@ -622,7 +627,7 @@ static void php_http_curlm_responsehandler(php_http_client_t *context)
 		if (msg && CURLMSG_DONE == msg->msg) {
 			if (CURLE_OK != msg->data.result) {
 				php_http_curle_storage_t *st = php_http_curle_get_storage(msg->easy_handle);
-				php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s; %s (%s)", curl_easy_strerror(msg->data.result), STR_PTR(st->errorbuffer), STR_PTR(st->url));
+				php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s; %s (%s)", curl_easy_strerror(st->errorcode = msg->data.result), STR_PTR(st->errorbuffer), STR_PTR(st->url));
 			}
 
 			if ((enqueue = php_http_client_enqueued(context, msg->easy_handle, compare_queue))) {
@@ -815,19 +820,20 @@ static STATUS php_http_curle_option_set_cookiestore(php_http_option_t *opt, zval
 {
 	php_http_client_curl_handler_t *curl = userdata;
 	CURL *ch = curl->handle;
+	php_http_curle_storage_t *storage = php_http_curle_get_storage(curl->handle);
 
-	if (val) {
-		php_http_curle_storage_t *storage = php_http_curle_get_storage(curl->handle);
-
-		if (storage->cookiestore) {
-			pefree(storage->cookiestore, 1);
-		}
+	if (storage->cookiestore) {
+		pefree(storage->cookiestore, 1);
+	}
+	if (val && Z_STRLEN_P(val)) {
 		storage->cookiestore = pestrndup(Z_STRVAL_P(val), Z_STRLEN_P(val), 1);
-		if (	CURLE_OK != curl_easy_setopt(ch, CURLOPT_COOKIEFILE, storage->cookiestore)
-			||	CURLE_OK != curl_easy_setopt(ch, CURLOPT_COOKIEJAR, storage->cookiestore)
-		) {
-			return FAILURE;
-		}
+	} else {
+		storage->cookiestore = NULL;
+	}
+	if (	CURLE_OK != curl_easy_setopt(ch, CURLOPT_COOKIEFILE, storage->cookiestore)
+		||	CURLE_OK != curl_easy_setopt(ch, CURLOPT_COOKIEJAR, storage->cookiestore)
+	) {
+		return FAILURE;
 	}
 	return SUCCESS;
 }
@@ -870,6 +876,11 @@ static STATUS php_http_curle_option_set_cookies(php_http_option_t *opt, zval *va
 				}
 			}
 		}
+	} else {
+		php_http_buffer_reset(&curl->options.cookies);
+		if (CURLE_OK != curl_easy_setopt(ch, CURLOPT_COOKIE, NULL)) {
+			return FAILURE;
+		}
 	}
 	return SUCCESS;
 }
@@ -1303,7 +1314,7 @@ static void php_http_curle_options_init(php_http_options_t *registry TSRMLS_DC)
 		}
 		if ((opt = php_http_option_register(registry, ZEND_STRL("certtype"), CURLOPT_SSLCERTTYPE, IS_STRING))) {
 			opt->flags |= PHP_HTTP_CURLE_OPTION_CHECK_STRLEN;
-			ZVAL_STRING(&opt->defval, "PEM", 1);
+			ZVAL_STRING(&opt->defval, "PEM", 0);
 		}
 		if ((opt = php_http_option_register(registry, ZEND_STRL("key"), CURLOPT_SSLKEY, IS_STRING))) {
 			opt->flags |= PHP_HTTP_CURLE_OPTION_CHECK_STRLEN;
@@ -1311,7 +1322,7 @@ static void php_http_curle_options_init(php_http_options_t *registry TSRMLS_DC)
 		}
 		if ((opt = php_http_option_register(registry, ZEND_STRL("keytype"), CURLOPT_SSLKEYTYPE, IS_STRING))) {
 			opt->flags |= PHP_HTTP_CURLE_OPTION_CHECK_STRLEN;
-			ZVAL_STRING(&opt->defval, "PEM", 1);
+			ZVAL_STRING(&opt->defval, "PEM", 0);
 		}
 		if ((opt = php_http_option_register(registry, ZEND_STRL("keypasswd"), CURLOPT_SSLKEYPASSWD, IS_STRING))) {
 			opt->flags |= PHP_HTTP_CURLE_OPTION_CHECK_STRLEN;
@@ -1725,6 +1736,9 @@ static void php_http_client_curl_dtor(php_http_client_t *h)
 
 #if PHP_HTTP_HAVE_EVENT
 	if (curl->timeout) {
+		if (event_initialized(curl->timeout) && event_pending(curl->timeout, EV_TIMEOUT, NULL)) {
+			event_del(curl->timeout);
+		}
 		efree(curl->timeout);
 		curl->timeout = NULL;
 	}