diff options
| author | Pierrick Charron <pierrick@php.net> | 2012-12-21 19:24:28 -0500 |
|---|---|---|
| committer | Pierrick Charron <pierrick@php.net> | 2012-12-21 19:24:28 -0500 |
| commit | 5499c7d201ad22f551dfc370ae09132acf4f75ec (patch) | |
| tree | a353f8a390986070d4b6ab10c0666641e20a2485 /ext/curl/interface.c | |
| parent | 59a4514dc0e8950ce210036332cc64c414fdcc22 (diff) | |
| parent | 1c553eba196b823439e69f003e63afd6d202d582 (diff) | |
| download | php-git-5499c7d201ad22f551dfc370ae09132acf4f75ec.tar.gz | |
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
Update NEWS file
Fixed bug #63352 (Can't enable hostname validation when using curl stream wrappers)
CURL >= 7.28.0 no longer support value 1 for CURLOPT_SSL_VERIFYHOST)
Conflicts:
ext/curl/interface.c
ext/curl/tests/bug63363.phpt
Diffstat (limited to 'ext/curl/interface.c')
| -rw-r--r-- | ext/curl/interface.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/ext/curl/interface.c b/ext/curl/interface.c index dbe48962dd..110603725f 100644 --- a/ext/curl/interface.c +++ b/ext/curl/interface.c @@ -1685,8 +1685,14 @@ 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)"); + if(Z_BVAL_PP(zvalue) == 1) { +#if LIBCURL_VERSION_NUM <= 0x071c00 /* 7.28.0 */ + php_error_docref(NULL TSRMLS_CC, E_NOTICE, "CURLOPT_SSL_VERIFYHOST with value 1 is deprecated and will be removed as of libcurl 7.28.1. It is recommended to use value 2 instead"); +#else + php_error_docref(NULL TSRMLS_CC, E_NOTICE, "CURLOPT_SSL_VERIFYHOST no longer accepts the value 1, value 2 will be used instead"); + error = curl_easy_setopt(ch->cp, option, 2); + break; +#endif } case CURLOPT_INFILESIZE: case CURLOPT_VERBOSE: |