diff options
| author | Brad King <brad.king@kitware.com> | 2018-10-22 16:55:14 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2018-10-22 16:55:14 (GMT) |
| commit | ec13ba36b5398f1d561d6e72d8e253d0eb3c2b5e (patch) | |
| tree | beb2cf13c007254d5daefa4bd929ce70520e890c /Utilities/cmcurl/lib/share.c | |
| parent | 8b5cd17000a6fcf3cf9637c4a5048a7a91fc68e3 (diff) | |
| parent | 031002456381245f88f64b0826798b1e249e8e39 (diff) | |
| download | CMake-ec13ba36b5398f1d561d6e72d8e253d0eb3c2b5e.zip CMake-ec13ba36b5398f1d561d6e72d8e253d0eb3c2b5e.tar.gz CMake-ec13ba36b5398f1d561d6e72d8e253d0eb3c2b5e.tar.bz2 | |
Merge branch 'update-curl' into release-3.13
Merge-request: !2509
Diffstat (limited to 'Utilities/cmcurl/lib/share.c')
| -rw-r--r-- | Utilities/cmcurl/lib/share.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/Utilities/cmcurl/lib/share.c b/Utilities/cmcurl/lib/share.c index 870b191..3d51086 100644 --- a/Utilities/cmcurl/lib/share.c +++ b/Utilities/cmcurl/lib/share.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2017, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2018, 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 @@ -25,6 +25,7 @@ #include <curl/curl.h> #include "urldata.h" #include "share.h" +#include "psl.h" #include "vtls/vtls.h" #include "curl_memory.h" @@ -106,6 +107,12 @@ curl_share_setopt(struct Curl_share *share, CURLSHoption option, ...) res = CURLSHE_NOMEM; break; + case CURL_LOCK_DATA_PSL: +#ifndef USE_LIBPSL + res = CURLSHE_NOT_BUILT_IN; +#endif + break; + default: res = CURLSHE_BAD_OPTION; } @@ -205,6 +212,8 @@ curl_share_cleanup(struct Curl_share *share) } #endif + Curl_psl_destroy(&share->psl); + if(share->unlockfunc) share->unlockfunc(NULL, CURL_LOCK_DATA_SHARE, share->clientdata); free(share); |