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

fix connection keep-alive behavior for HTTP/1.0

Browse Source 
svn:r822
This commit is contained in:
Niels Provos 2008-05-15 01:53:48 +00:00
parent 7be8f13b95
commit ec3956ba48
2 changed files with 22 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -99,7 +99,7 @@ Changes in current version:
o Make configure script work on IRIX. o Make configure script work on IRIX.
o provide a method for canceling ongoing http requests. o provide a method for canceling ongoing http requests.
o Make vsnprintf() returns consistent on win32. o Make vsnprintf() returns consistent on win32.
o Fix connection keep-alive behavior for HTTP/1.0
Changes in 1.4.0: Changes in 1.4.0:
o allow \r or \n individually to separate HTTP headers instead of the standard "\r\n"; from Charles Kerr. o allow \r or \n individually to separate HTTP headers instead of the standard "\r\n"; from Charles Kerr.

32
http.c
View File

@ -397,24 +397,34 @@ static void
evhttp_make_header_response(struct evhttp_connection *evcon, evhttp_make_header_response(struct evhttp_connection *evcon,
struct evhttp_request *req) struct evhttp_request *req)
{ {
int is_keepalive = evhttp_is_connection_keepalive(req->input_headers);
evbuffer_add_printf(bufferevent_get_output(evcon->bufev), evbuffer_add_printf(bufferevent_get_output(evcon->bufev),
"HTTP/%d.%d %d %s\r\n", "HTTP/%d.%d %d %s\r\n",
req->major, req->minor, req->response_code, req->major, req->minor, req->response_code,
req->response_code_line); req->response_code_line);
if (req->major == 1 && req->minor == 1) if (req->major == 1) {
evhttp_maybe_add_date_header(req->output_headers); if (req->minor == 1)
evhttp_maybe_add_date_header(req->output_headers);
if (req->major == 1 && /*
(req->minor == 1 || * if the protocol is 1.0; and the connection was keep-alive
evhttp_is_connection_keepalive(req->input_headers))) { * we need to add a keep-alive header, too.
/*
* we need to add the content length if the user did
* not give it, this is required for persistent
* connections to work.
*/ */
evhttp_maybe_add_content_length_header(req->output_headers, if (req->minor == 0 && is_keepalive)
(long)EVBUFFER_LENGTH(req->output_buffer)); evhttp_add_header(req->output_headers,
"Connection", "keep-alive");
if (req->minor == 1 || is_keepalive) {
/*
* we need to add the content length if the
* user did not give it, this is required for
* persistent connections to work.
*/
evhttp_maybe_add_content_length_header(
req->output_headers,
(long)EVBUFFER_LENGTH(req->output_buffer));
}
} }
/* Potentially add headers for unidentified content. */ /* Potentially add headers for unidentified content. */