diff options
| author | Zeev Suraski <zeev@php.net> | 2001-11-13 01:01:47 +0000 |
|---|---|---|
| committer | Zeev Suraski <zeev@php.net> | 2001-11-13 01:01:47 +0000 |
| commit | 6d7be11454e10f2d52b29051620fbc0f97f73779 (patch) | |
| tree | 9ac3043a55c7e22946dfaf94ae6288c0bb8c4bf7 /ext/curl/curl.c | |
| parent | 12cfb76b65b98413600f4da06a2efcc336d3eb7a (diff) | |
| download | php-git-6d7be11454e10f2d52b29051620fbc0f97f73779.tar.gz | |
Import patch from bug #14023
Diffstat (limited to 'ext/curl/curl.c')
| -rw-r--r-- | ext/curl/curl.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/ext/curl/curl.c b/ext/curl/curl.c index 4fd47b3978..2b29ba042d 100644 --- a/ext/curl/curl.c +++ b/ext/curl/curl.c @@ -142,6 +142,7 @@ PHP_MINIT_FUNCTION(curl) REGISTER_CURL_CONSTANT(CURLOPT_SSLCERT); REGISTER_CURL_CONSTANT(CURLOPT_SSLCERTPASSWD); REGISTER_CURL_CONSTANT(CURLOPT_WRITEHEADER); + REGISTER_CURL_CONSTANT(CURLOPT_SSL_VERIFYHOST); REGISTER_CURL_CONSTANT(CURLOPT_COOKIEFILE); REGISTER_CURL_CONSTANT(CURLOPT_SSLVERSION); REGISTER_CURL_CONSTANT(CURLOPT_TIMECONDITION); @@ -253,7 +254,7 @@ PHP_MINIT_FUNCTION(curl) REGISTER_CURL_CONSTANT(CURLE_OBSOLETE); REGISTER_CURL_CONSTANT(CURLE_SSL_PEER_CERTIFICATE); - if (curl_global_init(CURL_GLOBAL_NOTHING) != CURLE_OK) { + if (curl_global_init(CURL_GLOBAL_ALL) != CURLE_OK) { return FAILURE; } @@ -658,6 +659,7 @@ PHP_FUNCTION(curl_setopt) case CURLOPT_FRESH_CONNECT: case CURLOPT_FORBID_REUSE: case CURLOPT_CONNECTTIMEOUT: + case CURLOPT_SSL_VERIFYHOST: case CURLOPT_SSL_VERIFYPEER: convert_to_long_ex(zvalue); error = curl_easy_setopt(ch->cp, option, Z_LVAL_PP(zvalue)); |