Commit 82232bbb authored by Yang Tse's avatar Yang Tse
Browse files

curl: fix symbolic names for CURLUSESSL_* enum in --libcurl output

parent bb2e0686

src/tool_operate.c

+3 −3
Original line number Diff line number Diff line
@@ -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)

src/tool_setopt.c

+8 −0
Original line number Diff line number Diff line
@@ -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[] = {

src/tool_setopt.h

+3 −1
Original line number Diff line number Diff line
@@ -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