Merge remote-tracking branch 'origin/patches-2.0'

This commit is contained in:
Nick Mathewson 2011-04-26 23:48:31 -04:00
commit 614b9bd1f3

2
http.c
View File

@ -1024,6 +1024,7 @@ evhttp_read_cb(struct bufferevent *bufev, void *arg)
break;
case EVCON_IDLE:
{
#ifdef USE_DEBUG
struct evbuffer *input;
size_t total_len;
@ -1032,6 +1033,7 @@ evhttp_read_cb(struct bufferevent *bufev, void *arg)
event_debug(("%s: read %d bytes in EVCON_IDLE state,"
" resetting connection",
__func__, (int)total_len));
#endif
evhttp_connection_reset(evcon);
}