diff options
| author | Brad King <brad.king@kitware.com> | 2017-06-14 15:03:53 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2017-06-14 15:10:22 (GMT) |
| commit | a3ef36f153f51c33ea2154cff17bbf9abb7ee073 (patch) | |
| tree | 94283929f1d08444c255a490d10810d7c5df0e04 /Utilities/cmcurl/lib/conncache.c | |
| parent | 91101f108d68e8fe98c378f06e1ed12a513151fe (diff) | |
| parent | 06d6d6c4aee149cd6560b919ef6935ef0867d921 (diff) | |
| download | CMake-a3ef36f153f51c33ea2154cff17bbf9abb7ee073.zip CMake-a3ef36f153f51c33ea2154cff17bbf9abb7ee073.tar.gz CMake-a3ef36f153f51c33ea2154cff17bbf9abb7ee073.tar.bz2 | |
Merge branch 'upstream-curl' into update-curl
* upstream-curl:
curl 2017-06-14 (54b636f1)
Resolve a logical conflict in `Utilities/cmcurl/CMakeLists.txt`
by disabling CA bundle/path detection for build within CMake.
CMake already handles locating a CA bundle/path at runtime.
Diffstat (limited to 'Utilities/cmcurl/lib/conncache.c')
| -rw-r--r-- | Utilities/cmcurl/lib/conncache.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/Utilities/cmcurl/lib/conncache.c b/Utilities/cmcurl/lib/conncache.c index 0590ec6..c79d227 100644 --- a/Utilities/cmcurl/lib/conncache.c +++ b/Utilities/cmcurl/lib/conncache.c @@ -72,13 +72,11 @@ static void bundle_destroy(struct connectbundle *cb_ptr) /* Add a connection to a bundle */ static CURLcode bundle_add_conn(struct connectbundle *cb_ptr, - struct connectdata *conn) + struct connectdata *conn) { - if(!Curl_llist_insert_next(&cb_ptr->conn_list, cb_ptr->conn_list.tail, conn)) - return CURLE_OUT_OF_MEMORY; - + Curl_llist_insert_next(&cb_ptr->conn_list, cb_ptr->conn_list.tail, conn, + &conn->bundle_node); conn->bundle = cb_ptr; - cb_ptr->num_connections++; return CURLE_OK; } |