diff options
| author | Daniel Stenberg <daniel@haxx.se> | 2015-03-11 11:54:22 +0100 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2015-03-11 11:54:22 +0100 |
| commit | 852d35b6eadb0bc6117a31cc991f589285a3fc0a (patch) | |
| tree | e9ce01de98ef1864db1e8d356212b5c3c2453ac1 /lib/conncache.h | |
| parent | f39b1c080129c01c8204d3a5a40aad038c7a57f3 (diff) | |
| download | curl-852d35b6eadb0bc6117a31cc991f589285a3fc0a.tar.gz | |
proxy: re-use proxy connections (regression)
When checking for a connection to re-use, a proxy-using request must
check for and use a proxy connection and not one based on the host
name!
Added test 1421 to verify
Bug: http://curl.haxx.se/bug/view.cgi?id=1492
Diffstat (limited to 'lib/conncache.h')
| -rw-r--r-- | lib/conncache.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/conncache.h b/lib/conncache.h index d793f2482..e77a084a7 100644 --- a/lib/conncache.h +++ b/lib/conncache.h @@ -7,6 +7,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * + * Copyright (C) 2015, Daniel Stenberg, <daniel@haxx.se>, et al. * Copyright (C) 2012 - 2014, Linus Nielsen Feltzing, <linus@haxx.se> * * This software is licensed as described in the file COPYING, which @@ -33,8 +34,9 @@ struct conncache *Curl_conncache_init(int size); void Curl_conncache_destroy(struct conncache *connc); -struct connectbundle *Curl_conncache_find_bundle(struct conncache *connc, - char *hostname); +/* return the correct bundle, to a host or a proxy */ +struct connectbundle *Curl_conncache_find_bundle(struct connectdata *conn, + struct conncache *connc); CURLcode Curl_conncache_add_conn(struct conncache *connc, struct connectdata *conn); |