diff options
| author | Yang Tse <yangsita@gmail.com> | 2013-07-22 19:43:08 +0200 |
|---|---|---|
| committer | Yang Tse <yangsita@gmail.com> | 2013-07-22 21:40:43 +0200 |
| commit | 82232bbbaf06b4ea0b86344ccf3ee0b3f7b0c92c (patch) | |
| tree | 80de39c988e0e1ff0cc022b679ef0355e2ffe40d | |
| parent | bb2e0686abb01a04e3edc443ba72d18b744c3068 (diff) | |
curl: fix symbolic names for CURLUSESSL_* enum in --libcurl output
| -rw-r--r-- | src/tool_operate.c | 6 | ||||
| -rw-r--r-- | src/tool_setopt.c | 8 | ||||
| -rw-r--r-- | src/tool_setopt.h | 4 |
3 files changed, 14 insertions, 4 deletions
diff --git a/src/tool_operate.c b/src/tool_operate.c index 9b6dd625f..4df802967 100644 --- a/src/tool_operate.c +++ b/src/tool_operate.c @@ -1185,15 +1185,15 @@ int operate(struct Configurable *config, int argc, argv_item_t argv[]) /* new in curl 7.15.5 */ if(config->ftp_ssl_reqd) - my_setopt(curl, CURLOPT_USE_SSL, CURLUSESSL_ALL); + my_setopt_enum(curl, CURLOPT_USE_SSL, (long)CURLUSESSL_ALL); /* new in curl 7.11.0 */ else if(config->ftp_ssl) - my_setopt(curl, CURLOPT_USE_SSL, CURLUSESSL_TRY); + my_setopt_enum(curl, CURLOPT_USE_SSL, (long)CURLUSESSL_TRY); /* new in curl 7.16.0 */ else if(config->ftp_ssl_control) - my_setopt(curl, CURLOPT_USE_SSL, CURLUSESSL_CONTROL); + my_setopt_enum(curl, CURLOPT_USE_SSL, (long)CURLUSESSL_CONTROL); /* new in curl 7.16.1 */ if(config->ftp_ssl_ccc) diff --git a/src/tool_setopt.c b/src/tool_setopt.c index 4493e5f8d..19439923a 100644 --- a/src/tool_setopt.c +++ b/src/tool_setopt.c @@ -96,6 +96,14 @@ const NameValue setopt_nv_CURLFTPSSL_CCC[] = { NVEND, }; +const NameValue setopt_nv_CURLUSESSL[] = { + NV(CURLUSESSL_NONE), + NV(CURLUSESSL_TRY), + NV(CURLUSESSL_CONTROL), + NV(CURLUSESSL_ALL), + NVEND, +}; + /* These mappings essentially triplicated - see * tool_libinfo.c and tool_paramhlp.c */ const NameValue setopt_nv_CURLPROTO[] = { diff --git a/src/tool_setopt.h b/src/tool_setopt.h index d107756b4..6aeaecbe6 100644 --- a/src/tool_setopt.h +++ b/src/tool_setopt.h @@ -7,7 +7,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al. * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms @@ -51,6 +51,7 @@ extern const NameValue setopt_nv_CURL_HTTP_VERSION[]; extern const NameValue setopt_nv_CURL_SSLVERSION[]; extern const NameValue setopt_nv_CURL_TIMECOND[]; extern const NameValue setopt_nv_CURLFTPSSL_CCC[]; +extern const NameValue setopt_nv_CURLUSESSL[]; extern const NameValue setopt_nv_CURLPROTO[]; extern const NameValueUnsigned setopt_nv_CURLAUTH[]; @@ -60,6 +61,7 @@ extern const NameValueUnsigned setopt_nv_CURLAUTH[]; #define setopt_nv_CURLOPT_SSLVERSION setopt_nv_CURL_SSLVERSION #define setopt_nv_CURLOPT_TIMECONDITION setopt_nv_CURL_TIMECOND #define setopt_nv_CURLOPT_FTP_SSL_CCC setopt_nv_CURLFTPSSL_CCC +#define setopt_nv_CURLOPT_USE_SSL setopt_nv_CURLUSESSL #define setopt_nv_CURLOPT_PROTOCOLS setopt_nv_CURLPROTO #define setopt_nv_CURLOPT_REDIR_PROTOCOLS setopt_nv_CURLPROTO #define setopt_nv_CURLOPT_PROXYTYPE setopt_nv_CURLPROXY |