GitHub/libevent
1
0
Fork 0
mirror of https://github.com/libevent/libevent.git synced 2025-01-31 09:12:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

http: introduce evhttp_is_request_connection_close() helper

Browse Source
This commit is contained in:
Azat Khuzhin 2015-04-24 19:04:51 +03:00
parent 1dbb55da32
commit 6540da3893
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
http.c
View File

@ -461,6 +461,13 @@ evhttp_is_connection_close(int flags, struct evkeyvalq* headers)
return (connection != NULL && evutil_ascii_strcasecmp(connection, "close") == 0); return (connection != NULL && evutil_ascii_strcasecmp(connection, "close") == 0);
} }
} }
static int
evhttp_is_request_connection_close(struct evhttp_request *req)
{
return
evhttp_is_connection_close(req->flags, req->input_headers) ||
evhttp_is_connection_close(req->flags, req->output_headers);
}
/* Return true iff 'headers' contains 'Connection: keep-alive' */ /* Return true iff 'headers' contains 'Connection: keep-alive' */
static int static int
@ -773,16 +780,12 @@ evhttp_connection_done(struct evhttp_connection *evcon)
if (con_outgoing) { if (con_outgoing) {
/* idle or close the connection */ /* idle or close the connection */
int need_close; int need_close = evhttp_is_request_connection_close(req);
TAILQ_REMOVE(&evcon->requests, req, next); TAILQ_REMOVE(&evcon->requests, req, next);
req->evcon = NULL; req->evcon = NULL;
evcon->state = EVCON_IDLE; evcon->state = EVCON_IDLE;
need_close =
evhttp_is_connection_close(req->flags, req->input_headers)||
evhttp_is_connection_close(req->flags, req->output_headers);
/* check if we got asked to close the connection */ /* check if we got asked to close the connection */
if (need_close) if (need_close)
evhttp_connection_reset_(evcon); evhttp_connection_reset_(evcon);
@ -2602,9 +2605,8 @@ evhttp_send_done(struct evhttp_connection *evcon, void *arg)
need_close = need_close =
(REQ_VERSION_BEFORE(req, 1, 1) && (REQ_VERSION_BEFORE(req, 1, 1) &&
!evhttp_is_connection_keepalive(req->input_headers))|| !evhttp_is_connection_keepalive(req->input_headers)) ||
evhttp_is_connection_close(req->flags, req->input_headers) || evhttp_is_request_connection_close(req);
evhttp_is_connection_close(req->flags, req->output_headers);
EVUTIL_ASSERT(req->flags & EVHTTP_REQ_OWN_CONNECTION); EVUTIL_ASSERT(req->flags & EVHTTP_REQ_OWN_CONNECTION);
evhttp_request_free(req); evhttp_request_free(req);