X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=php_http_client_curl.c;h=9881301c3dce2c62b75fe04358d69adcd71ee9ca;hb=feab775de457917972ab8d2e47e12bded7f68872;hp=da19346b70168390cec95e54ea17f744d6409c11;hpb=7096ff6dbb61fd13b9b04ef86bfbece8fb4b2ea0;p=m6w6%2Fext-http

diff --git a/php_http_client_curl.c b/php_http_client_curl.c
index da19346..9881301 100644
--- a/php_http_client_curl.c
+++ b/php_http_client_curl.c
@@ -843,7 +843,7 @@ static ZEND_RESULT_CODE php_http_curle_option_set_cookiestore(php_http_option_t
 	if (storage->cookiestore) {
 		pefree(storage->cookiestore, 1);
 	}
-	if (val && Z_STRLEN_P(val)) {
+	if (val && Z_TYPE_P(val) == IS_STRING && Z_STRLEN_P(val)) {
 		storage->cookiestore = pestrndup(Z_STRVAL_P(val), Z_STRLEN_P(val), 1);
 	} else {
 		storage->cookiestore = NULL;
@@ -956,7 +956,7 @@ static ZEND_RESULT_CODE php_http_curle_option_set_etag(php_http_option_t *opt, z
 	php_http_client_curl_handler_t *curl = userdata;
 	php_http_buffer_t header;
 
-	if (Z_STRLEN_P(val)) {
+	if (val && Z_TYPE_P(val) == IS_STRING && Z_STRLEN_P(val)) {
 		zend_bool is_quoted = !((Z_STRVAL_P(val)[0] != '"') || (Z_STRVAL_P(val)[Z_STRLEN_P(val)-1] != '"'));
 		php_http_buffer_init(&header);
 		php_http_buffer_appendf(&header, is_quoted?"%s: %s":"%s: \"%s\"", curl->options.range_request?"If-Match":"If-None-Match", Z_STRVAL_P(val));
@@ -1227,7 +1227,7 @@ static void php_http_curle_options_init(php_http_options_t *registry)
 	/* useragent */
 	if ((opt = php_http_option_register(registry, ZEND_STRL("useragent"), CURLOPT_USERAGENT, IS_STRING))) {
 		/* don't check strlen, to allow sending no useragent at all */
-		ZVAL_STRING(&opt->defval,
+		ZVAL_PSTRING(&opt->defval,
 				"PECL_HTTP/" PHP_PECL_HTTP_VERSION " "
 				"PHP/" PHP_VERSION " "
 				"libcurl/" LIBCURL_VERSION);
@@ -1319,7 +1319,7 @@ static void php_http_curle_options_init(php_http_options_t *registry)
 		}
 		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");
+			ZVAL_PSTRING(&opt->defval, "PEM");
 		}
 		if ((opt = php_http_option_register(registry, ZEND_STRL("key"), CURLOPT_SSLKEY, IS_STRING))) {
 			opt->flags |= PHP_HTTP_CURLE_OPTION_CHECK_STRLEN;
@@ -1327,7 +1327,7 @@ static void php_http_curle_options_init(php_http_options_t *registry)
 		}
 		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");
+			ZVAL_PSTRING(&opt->defval, "PEM");
 		}
 		if ((opt = php_http_option_register(registry, ZEND_STRL("keypasswd"), CURLOPT_SSLKEYPASSWD, IS_STRING))) {
 			opt->flags |= PHP_HTTP_CURLE_OPTION_CHECK_STRLEN;
@@ -1346,7 +1346,7 @@ static void php_http_curle_options_init(php_http_options_t *registry)
 			opt->flags |= PHP_HTTP_CURLE_OPTION_CHECK_STRLEN;
 			opt->flags |= PHP_HTTP_CURLE_OPTION_CHECK_BASEDIR;
 #ifdef PHP_HTTP_CURL_CAINFO
-			ZVAL_STRING(&opt->defval, PHP_HTTP_CURL_CAINFO);
+			ZVAL_PSTRING(&opt->defval, PHP_HTTP_CURL_CAINFO);
 #endif
 		}
 		if ((opt = php_http_option_register(registry, ZEND_STRL("capath"), CURLOPT_CAPATH, IS_STRING))) {
@@ -1431,6 +1431,10 @@ static ZEND_RESULT_CODE php_http_curle_set_option(php_http_option_t *opt, zval *
 	case IS_STRING:
 		if (opt->setter) {
 			rv = opt->setter(opt, val, curl);
+		} else if (!val || Z_TYPE_P(val) == IS_NULL) {
+			if (CURLE_OK != (rc = curl_easy_setopt(ch, opt->option, NULL))) {
+				rv = FAILURE;
+			}
 		} else if ((opt->flags & PHP_HTTP_CURLE_OPTION_CHECK_STRLEN) && !Z_STRLEN_P(val)) {
 			if (CURLE_OK != (rc = curl_easy_setopt(ch, opt->option, NULL))) {
 				rv = FAILURE;