cuberite/libevent
1
0
Fork 0
mirror of https://github.com/cuberite/libevent.git synced 2025-09-12 05:48:51 -04:00
Code Issues Packages Projects Releases Wiki Activity

http: make fallback for EVHTTP_CON_READ_ON_WRITE_ERROR more cleaner

Browse Source
This commit is contained in:
Azat Khuzhin 2016-03-11 20:17:51 +03:00
parent 2ff164abac
commit d4054928c7
1 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
http.c
View File

@ -1348,6 +1348,8 @@ evhttp_connection_reset_(struct evhttp_connection *evcon)
err = evbuffer_drain(tmp, -1); err = evbuffer_drain(tmp, -1);
EVUTIL_ASSERT(!err && "drain input"); EVUTIL_ASSERT(!err && "drain input");
evcon->flags &= ~EVHTTP_CON_READING_ERROR;
evcon->state = EVCON_DISCONNECTED; evcon->state = EVCON_DISCONNECTED;
} }
@ -1435,7 +1437,13 @@ evhttp_connection_read_on_write_error(struct evhttp_connection *evcon,
{ {
struct evbuffer *buf; struct evbuffer *buf;
evcon->state = EVCON_READING_FIRSTLINE; /** Second time, we can't read anything */
if (evcon->flags & EVHTTP_CON_READING_ERROR) {
evcon->flags &= ~EVHTTP_CON_READING_ERROR;
evhttp_connection_fail_(evcon, EVREQ_HTTP_EOF);
return;
}
req->kind = EVHTTP_RESPONSE; req->kind = EVHTTP_RESPONSE;
buf = bufferevent_get_output(evcon->bufev); buf = bufferevent_get_output(evcon->bufev);
@ -1443,12 +1451,7 @@ evhttp_connection_read_on_write_error(struct evhttp_connection *evcon,
evbuffer_drain(buf, evbuffer_get_length(buf)); evbuffer_drain(buf, evbuffer_get_length(buf));
evbuffer_freeze(buf, 1); evbuffer_freeze(buf, 1);
bufferevent_setcb(evcon->bufev, evhttp_start_read_(evcon);
evhttp_read_cb,
NULL, /* evhttp_write_cb */
evhttp_error_cb,
evcon);
evhttp_connection_start_detectclose(evcon);
evcon->flags |= EVHTTP_CON_READING_ERROR; evcon->flags |= EVHTTP_CON_READING_ERROR;
} }
@ -1497,12 +1500,6 @@ evhttp_error_cb(struct bufferevent *bufev, short what, void *arg)
*/ */
if (evcon->flags & EVHTTP_CON_CLOSEDETECT) { if (evcon->flags & EVHTTP_CON_CLOSEDETECT) {
evcon->flags &= ~EVHTTP_CON_CLOSEDETECT; evcon->flags &= ~EVHTTP_CON_CLOSEDETECT;
if (evcon->flags & EVHTTP_CON_READING_ERROR) {
evcon->flags &= ~EVHTTP_CON_READING_ERROR;
evhttp_connection_fail_(evcon, EVREQ_HTTP_EOF);
return;
}
EVUTIL_ASSERT(evcon->http_server == NULL); EVUTIL_ASSERT(evcon->http_server == NULL);
/* For connections from the client, we just /* For connections from the client, we just
* reset the connection so that it becomes * reset the connection so that it becomes