mirror
/
darkhttpd
mirror of https://github.com/emikulic/darkhttpd.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix conn->close logic: 

. HTTP/1.1 protocol enables keep-alive.
. `Connection: keep-alive' enables keep-alive, regardless of protocol.
. `Connection: close' disables keep-alive.
This commit is contained in:
Emil Mikulic 2003-11-18 09:38:45 +00:00
parent 3389cc39d4
commit dd4a217817
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
trunk/darkhttpd.c
View File

@ -1245,6 +1245,7 @@ static void parse_range_field(struct connection *conn)
static void parse_request(struct connection *conn)
{
size_t bound1, bound2;
char *tmp;
assert(conn->request_length == strlen(conn->request));
/* parse method */
@ -1281,19 +1282,19 @@ static void parse_request(struct connection *conn)
;
proto = split_string(conn->request, bound1, bound2);
if (strcasecmp(proto, "HTTP/1.1") == 0)
{
char *tmp = parse_field(conn, "Connection: ");
conn->conn_close = 0;
if (tmp != NULL)
{
if (strcasecmp(tmp, "close") == 0) conn->conn_close = 1;
free(tmp);
}
}
if (strcasecmp(proto, "HTTP/1.1") == 0) conn->conn_close = 0;
free(proto);
}
/* parse connection field */
tmp = parse_field(conn, "Connection: ");
if (tmp != NULL)
{
if (strcasecmp(tmp, "close") == 0) conn->conn_close = 1;
else if (strcasecmp(tmp, "keep-alive") == 0) conn->conn_close = 0;
free(tmp);
}
/* parse referer, user_agent */
conn->referer = parse_field(conn, "Referer: ");
conn->user_agent = parse_field(conn, "User-Agent: ");