Skip to content
This repository has been archived by the owner on Jun 30, 2021. It is now read-only.

Commit

Permalink
request flags
Browse files Browse the repository at this point in the history
  • Loading branch information
@NathanFrench
NathanFrench committed May 22, 2017
1 parent 58da6dd commit 71341d9
Show file tree
Hide file tree
Showing 2 changed files with 39 additions and 34 deletions.
63 changes: 34 additions & 29 deletions evhtp.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1121,7 +1121,7 @@ htp__request_parse_start_(htparser * p)

if (c->request)
{
if (c->request->finished == 1)
if (c->request->flags & EVHTP_REQ_FLAG_FINISHED)
{
htp__request_free_(c->request);
} else {
Expand Down Expand Up @@ -1593,17 +1593,22 @@ htp__request_parse_headers_(htparser * p)
evhtp_assert(c != NULL);

/* XXX proto should be set with htparsers on_hdrs_begin hook */
c->request->keepalive = htparser_should_keep_alive(p);
c->request->proto = htp__protocol_(htparser_get_major(p), htparser_get_minor(p));
c->request->status = htp__hook_headers_(c->request, c->request->headers_in);

if (htparser_should_keep_alive(p) == 1)
{
c->request->flags |= EVHTP_REQ_FLAG_KEEPALIVE;
}

c->request->proto = htp__protocol_(htparser_get_major(p), htparser_get_minor(p));
c->request->status = htp__hook_headers_(c->request, c->request->headers_in);

if (c->request->status != EVHTP_RES_OK)
{
return -1;
}

if (c->type == evhtp_type_server &&
c->htp->flags & EVHTP_FLAG_ENABLE_100_CONT)
if (c->type == evhtp_type_server
&& c->htp->flags & EVHTP_FLAG_ENABLE_100_CONT)
{
/* only send a 100 continue response if it hasn't been disabled via
* evhtp_disable_100_continue.
Expand Down Expand Up @@ -1850,7 +1855,7 @@ htp__create_reply_(evhtp_request_t * request, evhtp_res code)
goto check_proto;
}

if (out_len && request->chunked == 0)
if (out_len && !(request->flags & EVHTP_REQ_FLAG_CHUNKED))
{
/* add extra headers (like content-length/type) if not already present */

Expand All @@ -1869,7 +1874,7 @@ htp__create_reply_(evhtp_request_t * request, evhtp_res code)
/* add the proper keep-alive type headers based on http version */
switch (request->proto) {
case EVHTP_PROTO_11:
if (request->keepalive == 0)
if (!(request->flags & EVHTP_REQ_FLAG_KEEPALIVE))
{
/* protocol is HTTP/1.1 but client wanted to close */
evhtp_headers_add_header(request->headers_out,
Expand All @@ -1884,7 +1889,7 @@ htp__create_reply_(evhtp_request_t * request, evhtp_res code)

break;
case EVHTP_PROTO_10:
if (request->keepalive == 1)
if (request->flags & EVHTP_REQ_FLAG_KEEPALIVE)
{
/* protocol is HTTP/1.0 and clients wants to keep established */
evhtp_headers_add_header(request->headers_out,
Expand Down Expand Up @@ -2091,7 +2096,8 @@ htp__connection_writecb_(evbev_t * bev, void * arg)
return;
}

if (c->request->finished == 0 || evbuffer_get_length(bufferevent_get_output(bev)))
if (!(c->request->flags & EVHTP_REQ_FLAG_FINISHED)
|| evbuffer_get_length(bufferevent_get_output(bev)))
{
return;
}
Expand All @@ -2105,11 +2111,11 @@ htp__connection_writecb_(evbev_t * bev, void * arg)
{
if (++c->num_requests >= c->htp->max_keepalive_requests)
{
c->request->keepalive = 0;
c->request->flags &= ~EVHTP_REQ_FLAG_KEEPALIVE;
}
}

if (c->request->keepalive == 1)
if (c->request->flags & EVHTP_REQ_FLAG_KEEPALIVE)
{
htp__request_free_(c->request);

Expand Down Expand Up @@ -2174,7 +2180,7 @@ htp__connection_eventcb_(evbev_t * bev, short events, void * arg)

if (c->request)
{
c->request->error = 1;
c->request->flags |= EVHTP_REQ_FLAG_ERROR;
}
}
#endif
Expand Down Expand Up @@ -3402,7 +3408,7 @@ evhtp_send_reply_body(evhtp_request_t * request, evbuf_t * buf)
void
evhtp_send_reply_end(evhtp_request_t * request)
{
request->finished = 1;
request->flags |= EVHTP_REQ_FLAG_FINISHED;
}

void
Expand All @@ -3413,7 +3419,7 @@ evhtp_send_reply(evhtp_request_t * request, evhtp_res code)
struct bufferevent * bev;

c = evhtp_request_get_connection(request);
request->finished = 1;
request->flags |= EVHTP_REQ_FLAG_FINISHED;

if (!(reply_buf = htp__create_reply_(request, code)))
{
Expand Down Expand Up @@ -3462,7 +3468,8 @@ evhtp_send_reply_chunk_start(evhtp_request_t * request, evhtp_res code)
*/

evhtp_kv_rm_and_free(request->headers_out, content_len);
request->chunked = 1;

request->flags |= EVHTP_REQ_FLAG_CHUNKED;
break;
case EVHTP_PROTO_10:
/*
Expand All @@ -3471,22 +3478,17 @@ evhtp_send_reply_chunk_start(evhtp_request_t * request, evhtp_res code)
*/
evhtp_kv_rm_and_free(request->headers_out, content_len);

#if 0
evhtp_headers_add_header(request->headers_out,
evhtp_header_new("Content-Length", "0", 0, 0));
#endif

request->chunked = 1;
request->flags |= EVHTP_REQ_FLAG_CHUNKED;
break;
default:
request->chunked = 0;
request->flags &= ~EVHTP_REQ_FLAG_CHUNKED;
break;
} /* switch */
} else {
request->chunked = 0;
request->flags &= ~EVHTP_REQ_FLAG_CHUNKED;
}

if (request->chunked == 1)
if (request->flags & EVHTP_REQ_FLAG_CHUNKED)
{
evhtp_headers_add_header(request->headers_out,
evhtp_header_new("Transfer-Encoding", "chunked", 0, 0));
Expand Down Expand Up @@ -3531,15 +3533,15 @@ evhtp_send_reply_chunk(evhtp_request_t * request, evbuf_t * buf)

output = bufferevent_get_output(request->conn->bev);

if (request->chunked == 1)
if (request->flags & EVHTP_REQ_FLAG_CHUNKED)
{
evbuffer_add_printf(output, "%x\r\n",
(unsigned)evbuffer_get_length(buf));
}

evhtp_send_reply_body(request, buf);

if (request->chunked)
if (request->flags & EVHTP_REQ_FLAG_CHUNKED)
{
evbuffer_add(output, "\r\n", 2);
}
Expand All @@ -3550,7 +3552,7 @@ evhtp_send_reply_chunk(evhtp_request_t * request, evbuf_t * buf)
void
evhtp_send_reply_chunk_end(evhtp_request_t * request)
{
if (request->chunked == 1)
if (request->flags & EVHTP_REQ_FLAG_CHUNKED)
{
evbuffer_add(bufferevent_get_output(evhtp_request_get_bev(request)),
"0\r\n\r\n", 5);
Expand Down Expand Up @@ -4556,7 +4558,10 @@ evhtp_request_set_bev(evhtp_request_t * request, evbev_t * bev)
void
evhtp_request_set_keepalive(evhtp_request_t * request, int val)
{
request->keepalive = (val > 0) ? 1 : 0;
if (val)
{
request->flags |= EVHTP_REQ_FLAG_KEEPALIVE;
}
}

evhtp_connection_t *
Expand Down
10 changes: 5 additions & 5 deletions evhtp.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -448,11 +448,11 @@ struct evhtp_request_s {
evhtp_proto proto; /**< HTTP protocol used */
htp_method method; /**< HTTP method used */
evhtp_res status; /**< The HTTP response code or other error conditions */
uint8_t keepalive : 1, /**< set to 1 if the connection is keep-alive */
finished : 1, /**< set to 1 if the request is fully processed */
chunked : 1, /**< set to 1 if the request is chunked */
error : 1, /**< set if any sort of error has occurred. */
pad : 4; /**< to be used in evhtp2 for new stuff */
#define EVHTP_REQ_FLAG_KEEPALIVE (1 << 1)
#define EVHTP_REQ_FLAG_FINISHED (1 << 2)
#define EVHTP_REQ_FLAG_CHUNKED (1 << 3)
#define EVHTP_REQ_FLAG_ERROR (1 << 4)
uint16_t flags;

evhtp_callback_cb cb; /**< the function to call when fully processed */
void * cbarg; /**< argument which is passed to the cb function */
Expand Down

0 comments on commit 71341d9

Please sign in to comment.