diff options
| -rw-r--r-- | src/tool_operate.c | 17 | ||||
| -rw-r--r-- | tests/libtest/lib510.c | 4 | ||||
| -rw-r--r-- | tests/libtest/lib579.c | 4 | ||||
| -rw-r--r-- | tests/libtest/lib590.c | 4 |
4 files changed, 17 insertions, 12 deletions
diff --git a/src/tool_operate.c b/src/tool_operate.c index bbefa8298..8c544194a 100644 --- a/src/tool_operate.c +++ b/src/tool_operate.c @@ -841,15 +841,20 @@ int operate(struct Configurable *config, int argc, argv_item_t argv[]) /* new in libcurl 7.10.6 */ if(config->proxyanyauth) - my_setopt_flags(curl, CURLOPT_PROXYAUTH, CURLAUTH_ANY); + my_setopt_flags(curl, CURLOPT_PROXYAUTH, + (long) CURLAUTH_ANY); else if(config->proxynegotiate) - my_setopt_flags(curl, CURLOPT_PROXYAUTH, CURLAUTH_GSSNEGOTIATE); + my_setopt_flags(curl, CURLOPT_PROXYAUTH, + (long) CURLAUTH_GSSNEGOTIATE); else if(config->proxyntlm) - my_setopt_flags(curl, CURLOPT_PROXYAUTH, CURLAUTH_NTLM); + my_setopt_flags(curl, CURLOPT_PROXYAUTH, + (long) CURLAUTH_NTLM); else if(config->proxydigest) - my_setopt_flags(curl, CURLOPT_PROXYAUTH, CURLAUTH_DIGEST); + my_setopt_flags(curl, CURLOPT_PROXYAUTH, + (long) CURLAUTH_DIGEST); else if(config->proxybasic) - my_setopt_flags(curl, CURLOPT_PROXYAUTH, CURLAUTH_BASIC); + my_setopt_flags(curl, CURLOPT_PROXYAUTH, + (long) CURLAUTH_BASIC); /* new in libcurl 7.19.4 */ my_setopt(curl, CURLOPT_NOPROXY, config->noproxy); @@ -914,7 +919,7 @@ int operate(struct Configurable *config, int argc, argv_item_t argv[]) /* new in libcurl 7.10.6 (default is Basic) */ if(config->authtype) - my_setopt_flags(curl, CURLOPT_HTTPAUTH, config->authtype); + my_setopt_flags(curl, CURLOPT_HTTPAUTH, (long) config->authtype); /* curl 7.19.1 (the 301 version existed in 7.18.2), 303 was added in 7.26.0 */ diff --git a/tests/libtest/lib510.c b/tests/libtest/lib510.c index 779164ad5..8278631c1 100644 --- a/tests/libtest/lib510.c +++ b/tests/libtest/lib510.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2011, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2012, 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 @@ -109,7 +109,7 @@ int test(char *URL) test_setopt(curl, CURLOPT_HTTPHEADER, slist); #ifdef LIB565 - test_setopt(curl, CURLOPT_HTTPAUTH, CURLAUTH_DIGEST); + test_setopt(curl, CURLOPT_HTTPAUTH, (long)CURLAUTH_DIGEST); test_setopt(curl, CURLOPT_USERPWD, "foo:bar"); #endif diff --git a/tests/libtest/lib579.c b/tests/libtest/lib579.c index 56193a181..c5cf603bb 100644 --- a/tests/libtest/lib579.c +++ b/tests/libtest/lib579.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2011, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2012, 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 @@ -137,7 +137,7 @@ int test(char *URL) /* enforce chunked transfer by setting the header */ test_setopt(curl, CURLOPT_HTTPHEADER, slist); - test_setopt(curl, CURLOPT_HTTPAUTH, CURLAUTH_DIGEST); + test_setopt(curl, CURLOPT_HTTPAUTH, (long)CURLAUTH_DIGEST); test_setopt(curl, CURLOPT_USERPWD, "foo:bar"); /* we want to use our own progress function */ diff --git a/tests/libtest/lib590.c b/tests/libtest/lib590.c index 75c90d53f..68603c65e 100644 --- a/tests/libtest/lib590.c +++ b/tests/libtest/lib590.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2011, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2012, 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 @@ -55,7 +55,7 @@ int test(char *URL) test_setopt(curl, CURLOPT_URL, URL); test_setopt(curl, CURLOPT_HEADER, 1L); test_setopt(curl, CURLOPT_PROXYAUTH, - CURLAUTH_BASIC | CURLAUTH_DIGEST | CURLAUTH_NTLM); + (long) (CURLAUTH_BASIC | CURLAUTH_DIGEST | CURLAUTH_NTLM)); test_setopt(curl, CURLOPT_PROXY, libtest_arg2); /* set in first.c */ test_setopt(curl, CURLOPT_PROXYUSERPWD, "me:password"); |