diff options
| author | Daniel Stenberg <daniel@haxx.se> | 2018-03-10 23:48:43 +0100 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2018-03-12 08:07:42 +0100 |
| commit | 8b498a875c975294545581282289991bbcfeabf4 (patch) | |
| tree | 9325c7d3f5b504538927a782d644f0261aee035a /lib/multi.c | |
| parent | 7fe68c39b3dbfd9b2440f37e298e9134c30e00c7 (diff) | |
http2: mark the connection for close on GOAWAY
... don't consider it an error!
Assisted-by: Jay Satiro
Reported-by: Łukasz Domeradzki
Fixes #2365
Closes #2375
Diffstat (limited to 'lib/multi.c')
| -rw-r--r-- | lib/multi.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/lib/multi.c b/lib/multi.c index ca3a877eb..98e5fca2a 100644 --- a/lib/multi.c +++ b/lib/multi.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 @@ -538,11 +538,8 @@ static CURLcode multi_done(struct connectdata **connp, result = CURLE_ABORTED_BY_CALLBACK; } - if(conn->send_pipe.size + conn->recv_pipe.size != 0 && - !data->set.reuse_forbid && - !conn->bits.close) { - /* Stop if pipeline is not empty and we do not have to close - connection. */ + if(conn->send_pipe.size || conn->recv_pipe.size) { + /* Stop if pipeline is not empty . */ data->easy_conn = NULL; DEBUGF(infof(data, "Connection still in use, no more multi_done now!\n")); return CURLE_OK; |