Merged revisions 212249 via svnmerge from

https://origsvn.digium.com/svn/asterisk/trunk

........
  r212249 | tilghman | 2009-08-14 12:36:40 -0500 (Fri, 14 Aug 2009) | 2 lines
  
  Add SSL_VERIFYPEER, as requested on the -users list
........


git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@212250 f38db490-d61c-443f-a65b-d21fe96a405b

1 files changed, 20 insertions, 16 deletions

diff --git a/funcs/func_curl.c b/funcs/func_curl.c
index d4f34b850..d10209822 100644
--- a/funcs/func_curl.c
+++ b/funcs/func_curl.c
@@ -148,6 +148,9 @@ static int parse_curlopt_key(const char *name, CURLoption *key, enum optiontype
 	} else if (!strcasecmp(name, "ftptext")) {
 		*key = CURLOPT_TRANSFERTEXT;
 		*ot = OT_BOOLEAN;
+	} else if (!strcasecmp(name, "ssl_verifypeer")) {
+		*key = CURLOPT_SSL_VERIFYPEER;
+		*ot = OT_BOOLEAN;
 	} else if (!strcasecmp(name, "hashcompat")) {
 		*key = CURLOPT_SPECIAL_HASHCOMPAT;
 		*ot = OT_BOOLEAN;
@@ -514,22 +517,23 @@ struct ast_custom_function acf_curlopt = {
 	.synopsis = "Set options for use with the CURL() function",
 	.syntax = "CURLOPT(<option>)",
 	.desc =
-"  cookie       - Send cookie with request\n"
-"  conntimeout  - Number of seconds to wait for connection\n"
-"  dnstimeout   - Number of seconds to wait for DNS response\n"
-"  ftptext      - For FTP, force a text transfer (boolean)\n"
-"  ftptimeout   - For FTP, the server response timeout\n"
-"  header       - Retrieve header information (boolean)\n"
-"  httptimeout  - Number of seconds to wait for HTTP response\n"
-"  maxredirs    - Maximum number of redirects to follow\n"
-"  proxy        - Hostname or IP to use as a proxy\n"
-"  proxytype    - http, socks4, or socks5\n"
-"  proxyport    - port number of the proxy\n"
-"  proxyuserpwd - A <user>:<pass> to use for authentication\n"
-"  referer      - Referer URL to use for the request\n"
-"  useragent    - UserAgent string to use\n"
-"  userpwd      - A <user>:<pass> to use for authentication\n"
-"  hashcompat   - Result data will be compatible for use with HASH()\n"
+"  cookie         - Send cookie with request [none]\n"
+"  conntimeout    - Number of seconds to wait for connection\n"
+"  dnstimeout     - Number of seconds to wait for DNS response\n"
+"  ftptext        - For FTP, force a text transfer (boolean)\n"
+"  ftptimeout     - For FTP, the server response timeout\n"
+"  header         - Retrieve header information (boolean)\n"
+"  httptimeout    - Number of seconds to wait for HTTP response\n"
+"  maxredirs      - Maximum number of redirects to follow\n"
+"  proxy          - Hostname or IP to use as a proxy\n"
+"  proxytype      - http, socks4, or socks5\n"
+"  proxyport      - port number of the proxy\n"
+"  proxyuserpwd   - A <user>:<pass> to use for authentication\n"
+"  referer        - Referer URL to use for the request\n"
+"  useragent      - UserAgent string to use\n"
+"  userpwd        - A <user>:<pass> to use for authentication\n"
+"  ssl_verifypeer - Whether to verify the peer certificate (boolean)\n"
+"  hashcompat     - Result data will be compatible for use with HASH()\n"
 "",
 	.read = acf_curlopt_read,
 	.write = acf_curlopt_write,