diff options
| author | Alex Deymo <deymo@google.com> | 2018-01-08 20:49:55 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-01-08 20:49:55 +0000 |
| commit | d6cc5657f76e9d919cb763997c725dac3d737bfe (patch) | |
| tree | 10f2cc17311582d8f1b00ecf3ab0c4af213b839d /lib/share.h | |
| parent | aae00d53fb85eb5e1a4b768f0c353c4e5884baff (diff) | |
| parent | fb9bb4b2ab398c43e78c91e514b108e0ed83520d (diff) | |
| download | android_external_curl-d6cc5657f76e9d919cb763997c725dac3d737bfe.tar.gz android_external_curl-d6cc5657f76e9d919cb763997c725dac3d737bfe.tar.bz2 android_external_curl-d6cc5657f76e9d919cb763997c725dac3d737bfe.zip | |
Merge "Update from 7.55.1 to 7.57.0" am: 96660a18c5 am: 484d473385
am: fb9bb4b2ab
Change-Id: Ibdd1eef03d7087e66dc85d29773988cd9a3f9d3e
Diffstat (limited to 'lib/share.h')
| -rw-r--r-- | lib/share.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/share.h b/lib/share.h index c039a16..4b13406 100644 --- a/lib/share.h +++ b/lib/share.h @@ -7,7 +7,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2016, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2017, 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 @@ -26,6 +26,7 @@ #include <curl/curl.h> #include "cookie.h" #include "urldata.h" +#include "conncache.h" /* SalfordC says "A structure member may not be volatile". Hence: */ @@ -43,7 +44,7 @@ struct Curl_share { curl_lock_function lockfunc; curl_unlock_function unlockfunc; void *clientdata; - + struct conncache conn_cache; struct curl_hash hostcache; #if !defined(CURL_DISABLE_HTTP) && !defined(CURL_DISABLE_COOKIES) struct CookieInfo *cookies; |