Fixed bug #63352 (Can't enable hostname validation when using curl stream wrappers)

adoy · adoy · commit af10e698a24e · 2012-12-21T19:12:43.000-05:00
diff --git a/ext/curl/streams.c b/ext/curl/streams.c
@@ -331,7 +331,7 @@ php_stream *php_curl_stream_opener(php_stream_wrapper *wrapper, char *filename,
 		}
 
 		if (SUCCESS == php_stream_context_get_option(context, "http", "curl_verify_ssl_host", &ctx_opt) && Z_TYPE_PP(ctx_opt) == IS_BOOL && Z_LVAL_PP(ctx_opt) == 1) {
-			curl_easy_setopt(curlstream->curl, CURLOPT_SSL_VERIFYHOST, 1);
+			curl_easy_setopt(curlstream->curl, CURLOPT_SSL_VERIFYHOST, 2);
 		} else {
 			curl_easy_setopt(curlstream->curl, CURLOPT_SSL_VERIFYHOST, 0);
 		}
@@ -420,7 +420,7 @@ php_stream *php_curl_stream_opener(php_stream_wrapper *wrapper, char *filename,
 		}
 	} else if (context && !strncasecmp(filename, "ftps", sizeof("ftps")-1)) {
 		if (SUCCESS == php_stream_context_get_option(context, "ftp", "curl_verify_ssl_host", &ctx_opt) && Z_TYPE_PP(ctx_opt) == IS_BOOL && Z_LVAL_PP(ctx_opt) == 1) {
-			curl_easy_setopt(curlstream->curl, CURLOPT_SSL_VERIFYHOST, 1);
+			curl_easy_setopt(curlstream->curl, CURLOPT_SSL_VERIFYHOST, 2);
 		} else {
 			curl_easy_setopt(curlstream->curl, CURLOPT_SSL_VERIFYHOST, 0);
 		}

Original file line number	Diff line number	Diff line change
`@@ -331,7 +331,7 @@ php_stream php_curl_stream_opener(php_stream_wrapper wrapper, char *filename,`
`331`	`331`	`}`
`332`	`332`
`333`	`333`	`if (SUCCESS == php_stream_context_get_option(context, "http", "curl_verify_ssl_host", &ctx_opt) && Z_TYPE_PP(ctx_opt) == IS_BOOL && Z_LVAL_PP(ctx_opt) == 1) {`
`334`		`- curl_easy_setopt(curlstream->curl, CURLOPT_SSL_VERIFYHOST, 1);`
	`334`	`+ curl_easy_setopt(curlstream->curl, CURLOPT_SSL_VERIFYHOST, 2);`
`335`	`335`	`} else {`
`336`	`336`	`curl_easy_setopt(curlstream->curl, CURLOPT_SSL_VERIFYHOST, 0);`
`337`	`337`	`}`
`@@ -420,7 +420,7 @@ php_stream php_curl_stream_opener(php_stream_wrapper wrapper, char *filename,`
`420`	`420`	`}`
`421`	`421`	`} else if (context && !strncasecmp(filename, "ftps", sizeof("ftps")-1)) {`
`422`	`422`	`if (SUCCESS == php_stream_context_get_option(context, "ftp", "curl_verify_ssl_host", &ctx_opt) && Z_TYPE_PP(ctx_opt) == IS_BOOL && Z_LVAL_PP(ctx_opt) == 1) {`
`423`		`- curl_easy_setopt(curlstream->curl, CURLOPT_SSL_VERIFYHOST, 1);`
	`423`	`+ curl_easy_setopt(curlstream->curl, CURLOPT_SSL_VERIFYHOST, 2);`
`424`	`424`	`} else {`
`425`	`425`	`curl_easy_setopt(curlstream->curl, CURLOPT_SSL_VERIFYHOST, 0);`
`426`	`426`	`}`