cvs: php4(PHP_4_0_7) /ext/curl curl.c

zeev Mon Nov 12 20:15:52 2001 EDT Modified files: (Branch: PHP_4_0_7) /php4/ext/curl curl.c Log: MFH - SSL fixes Index: php4/ext/curl/curl.c diff -u php4/ext/curl/curl.c:1.79.2.1 php4/ext/curl/curl.c:1.79.2.2 --- php4/ext/curl/curl.c:1.79.2.1 Thu Oct 11 19:51:12 2001 +++ php4/ext/curl/curl.c Mon Nov 12 20:15:51 2001 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: curl.c,v 1.79.2.1 2001/10/11 23:51:12 ssb Exp $ */ +/* $Id: curl.c,v 1.79.2.2 2001/11/13 01:15:51 zeev Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -142,6 +142,7 @@ REGISTER_CURL_CONSTANT("CURLOPT_SSLCERT", CURLOPT_SSLCERT); REGISTER_CURL_CONSTANT("CURLOPT_SSLCERTPASSWD", CURLOPT_SSLCERTPASSWD); REGISTER_CURL_CONSTANT("CURLOPT_WRITEHEADER", CURLOPT_WRITEHEADER); + REGISTER_CURL_CONSTANT("CURLOPT_SSL_VERIFYHOST", CURLOPT_SSL_VERIFYHOST); REGISTER_CURL_CONSTANT("CURLOPT_COOKIEFILE", CURLOPT_COOKIEFILE); REGISTER_CURL_CONSTANT("CURLOPT_SSLVERSION", CURLOPT_SSLVERSION); REGISTER_CURL_CONSTANT("CURLOPT_TIMECONDITION", CURLOPT_TIMECONDITION); @@ -244,6 +245,9 @@ REGISTER_CURL_CONSTANT("CURLE_TELNET_OPTION_SYNTAX", CURLE_TELNET_OPTION_SYNTAX); REGISTER_CURL_CONSTANT("CURLE_ALREADY_COMPLETE", CURLE_ALREADY_COMPLETE); + if (curl_global_init(CURL_GLOBAL_ALL) != CURLE_OK) { + return FAILURE; + } return SUCCESS; } /* }}} */ @@ -633,6 +637,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));