summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2014-11-30 11:11:33 -0500
committerNick Mathewson <nickm@torproject.org>2014-11-30 11:11:33 -0500
commitc51c85d397c3838cdc81c7dd6a232f3551338ed8 (patch)
tree41f6ee3d60e84a7b19d4419812614e5e1e9806db
parenta5d43cf4c6a6d4c1fbb7ed244eac9124317d273d (diff)
parentbc79cc5c80ee374dec0e968bc6fdf301d479e133 (diff)
downloadlibevent-c51c85d397c3838cdc81c7dd6a232f3551338ed8.tar.gz
Merge remote-tracking branch 'origin/pr/175'
-rw-r--r--http.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/http.c b/http.c
index 3941d179..2049e4d7 100644
--- a/http.c
+++ b/http.c
@@ -1285,6 +1285,7 @@ evhttp_connection_cb_cleanup(struct evhttp_connection *evcon)
{
struct evcon_requestq requests;
+ evhttp_connection_reset_(evcon);
if (evcon->retry_max < 0 || evcon->retry_cnt < evcon->retry_max) {
struct timeval tv_retry = evcon->initial_retry_timeout;
int i;
@@ -1306,7 +1307,6 @@ evhttp_connection_cb_cleanup(struct evhttp_connection *evcon)
evcon->retry_cnt++;
return;
}
- evhttp_connection_reset_(evcon);
/*
* User callback can do evhttp_make_request() on the same