diff options
| author | Brad King <brad.king@kitware.com> | 2020-06-26 13:30:18 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2020-06-26 13:30:25 (GMT) |
| commit | ac4ac035976ed4f253854966303c5c34886860e9 (patch) | |
| tree | 043554f2c09f5519128579f3de7bd5b5e9ac568e /Utilities/cmcurl/lib/http_digest.c | |
| parent | 035a3940f5c5ac4206b9b841be5d974e0b038c2f (diff) | |
| parent | e5ff413f41877dc46498c384fa4f6e5b23ec1476 (diff) | |
| download | CMake-ac4ac035976ed4f253854966303c5c34886860e9.zip CMake-ac4ac035976ed4f253854966303c5c34886860e9.tar.gz CMake-ac4ac035976ed4f253854966303c5c34886860e9.tar.bz2 | |
Merge topic 'update-curl'
e5ff413f41 curl: Set build options the way we need for CMake
0ef8fa5000 Merge branch 'upstream-curl' into update-curl
5717fdc114 curl 2020-06-23 (e9db32a0)
39f7cfad31 curl: Update script to get curl 7.71.0
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4937
Diffstat (limited to 'Utilities/cmcurl/lib/http_digest.c')
| -rw-r--r-- | Utilities/cmcurl/lib/http_digest.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/Utilities/cmcurl/lib/http_digest.c b/Utilities/cmcurl/lib/http_digest.c index 9616c30..b06dc0d 100644 --- a/Utilities/cmcurl/lib/http_digest.c +++ b/Utilities/cmcurl/lib/http_digest.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2019, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2020, 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 @@ -94,15 +94,19 @@ CURLcode Curl_output_digest(struct connectdata *conn, struct auth *authp; if(proxy) { +#ifdef CURL_DISABLE_PROXY + return CURLE_NOT_BUILT_IN; +#else digest = &data->state.proxydigest; - allocuserpwd = &conn->allocptr.proxyuserpwd; + allocuserpwd = &data->state.aptr.proxyuserpwd; userp = conn->http_proxy.user; passwdp = conn->http_proxy.passwd; authp = &data->state.authproxy; +#endif } else { digest = &data->state.digest; - allocuserpwd = &conn->allocptr.userpwd; + allocuserpwd = &data->state.aptr.userpwd; userp = conn->user; passwdp = conn->passwd; authp = &data->state.authhost; |