diff options
| author | Daniel Stenberg <daniel@haxx.se> | 2019-06-11 23:50:26 +0200 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2019-06-12 12:31:23 +0200 |
| commit | 8b987cc7eb8bd58eaf7c184e0db7103a236704bd (patch) | |
| tree | 8e8ffde04e804140c59fff5e2146deb55490465a /lib/hash.h | |
| parent | f67009dd980d370f0518a923ba17947fe452451d (diff) | |
multi: fix the transfer hashes in the socket hash entries
- The transfer hashes weren't using the correct keys so removing entries
failed.
- Simplified the iteration logic over transfers sharing the same socket and
they now simply are set to expire and thus get handled in the "regular"
timer loop instead.
Reported-by: Tom van der Woerdt
Fixes #4012
Closes #4014
Diffstat (limited to 'lib/hash.h')
| -rw-r--r-- | lib/hash.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/hash.h b/lib/hash.h index 90a25d1ca..558d0f47c 100644 --- a/lib/hash.h +++ b/lib/hash.h @@ -7,7 +7,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2017, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2019, 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 @@ -80,7 +80,7 @@ int Curl_hash_delete(struct curl_hash *h, void *key, size_t key_len); void *Curl_hash_pick(struct curl_hash *, void *key, size_t key_len); void Curl_hash_apply(struct curl_hash *h, void *user, void (*cb)(void *user, void *ptr)); -int Curl_hash_count(struct curl_hash *h); +#define Curl_hash_count(h) ((h)->size) void Curl_hash_destroy(struct curl_hash *h); void Curl_hash_clean(struct curl_hash *h); void Curl_hash_clean_with_criterium(struct curl_hash *h, void *user, |