summaryrefslogtreecommitdiff
path: root/ext/curl/interface.c
diff options
context:
space:
mode:
authorAndrey Hristov <andrey@php.net>2012-10-31 15:55:04 +0100
committerAndrey Hristov <andrey@php.net>2012-10-31 15:55:04 +0100
commitf2f380407ac4138a483b43f9649695db36e42c8c (patch)
treee7048592c57ca7c0822c2cbe47cbf9f9e86679ea /ext/curl/interface.c
parentd62bc53a4fb2058a06f356b5779a0db88f6e207c (diff)
parent8fb26e76ba463cfd38433bb2f19be84ff79b11b8 (diff)
downloadphp-git-f2f380407ac4138a483b43f9649695db36e42c8c.tar.gz
Merge branch 'master' of ssh://git.php.net/php-src
Diffstat (limited to 'ext/curl/interface.c')
-rw-r--r--ext/curl/interface.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/ext/curl/interface.c b/ext/curl/interface.c
index d9abece5fc..eb7ed8d202 100644
--- a/ext/curl/interface.c
+++ b/ext/curl/interface.c
@@ -2014,6 +2014,10 @@ static int _php_curl_setopt(php_curl *ch, long option, zval **zvalue, zval *retu
switch (option) {
/* Long options */
+ case CURLOPT_SSL_VERIFYHOST:
+ if(Z_TYPE_PP(zvalue)==IS_BOOL && Z_BVAL_PP(zvalue)) {
+ php_error_docref(NULL TSRMLS_CC, E_NOTICE, "CURLOPT_SSL_VERIFYHOST set to true which disables common name validation (setting CURLOPT_SSL_VERIFYHOST to 2 enables common name validation)");
+ }
case CURLOPT_AUTOREFERER:
case CURLOPT_BUFFERSIZE:
case CURLOPT_CLOSEPOLICY:
@@ -2048,7 +2052,6 @@ static int _php_curl_setopt(php_curl *ch, long option, zval **zvalue, zval *retu
case CURLOPT_PUT:
case CURLOPT_RESUME_FROM:
case CURLOPT_SSLVERSION:
- case CURLOPT_SSL_VERIFYHOST:
case CURLOPT_SSL_VERIFYPEER:
case CURLOPT_TIMECONDITION:
case CURLOPT_TIMEOUT: