diff options
author | peter <peter@FreeBSD.org> | 2014-05-27 04:52:32 +0000 |
---|---|---|
committer | peter <peter@FreeBSD.org> | 2014-05-27 04:52:32 +0000 |
commit | 20eb9148a2d9ce8554aaf5a7e41cf23cd6a9e2fb (patch) | |
tree | 058bc3f784d6bd7edece1de1cfc5a3cdaaa021f6 /contrib/serf/ssltunnel.c | |
parent | 418c5c97b2c06e1fdf86dc210ba28056a9502d35 (diff) | |
download | FreeBSD-src-20eb9148a2d9ce8554aaf5a7e41cf23cd6a9e2fb.zip FreeBSD-src-20eb9148a2d9ce8554aaf5a7e41cf23cd6a9e2fb.tar.gz |
Update serf 1.3.4 -> 1.3.5
Diffstat (limited to 'contrib/serf/ssltunnel.c')
-rw-r--r-- | contrib/serf/ssltunnel.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/contrib/serf/ssltunnel.c b/contrib/serf/ssltunnel.c index 28ca127..0ad04d6 100644 --- a/contrib/serf/ssltunnel.c +++ b/contrib/serf/ssltunnel.c @@ -70,12 +70,11 @@ static apr_status_t handle_response(serf_request_t *request, req_ctx_t *ctx = handler_baton; serf_connection_t *conn = request->conn; - if (! response) { - serf_connection_request_create(conn, - setup_request, - ctx); + /* CONNECT request was cancelled. Assuming that this is during connection + reset, we can safely discard the request as a new one will be created + when setting up the next connection. */ + if (!response) return APR_SUCCESS; - } status = serf_bucket_response_status(response, &sl); if (SERF_BUCKET_READ_ERROR(status)) { |