cvs: php4 /ext/curl curl.c

zeev Mon Nov 12 20:01:49 2001 EDT Modified files: /php4/ext/curl curl.c Log: Import patch from bug #14023 Index: php4/ext/curl/curl.c diff -u php4/ext/curl/curl.c:1.94 php4/ext/curl/curl.c:1.95 --- php4/ext/curl/curl.c:1.94 Thu Oct 18 15:24:51 2001 +++ php4/ext/curl/curl.c Mon Nov 12 20:01:47 2001 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: curl.c,v 1.94 2001/10/18 19:24:51 fmk Exp $ */ +/* $Id: curl.c,v 1.95 2001/11/13 01:01:47 zeev Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -142,6 +142,7 @@ 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 @@ 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 @@ 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));