use keep-alive timeout while waiting for HTTP headers; use always the read timeout while waiting for the HTTP body

From: Stefan Bühler <stbuehler@web.de>

git-svn-id: svn://svn.lighttpd.net/lighttpd/branches/lighttpd-1.4.x@2962 152afb58-edef-0310-8abb-c4023f1b3aa9
svn/tags/lighttpd-1.4.36
Stefan Bühler 9 years ago
parent e1b1c52028
commit 3605a3bec3
  1. 2
      NEWS
  2. 20
      src/server.c

@ -4,7 +4,7 @@ NEWS
====
- 1.4.36
*
* use keep-alive timeout while waiting for HTTP headers; use always the read timeout while waiting for the HTTP body
- 1.4.35 - 2014-03-12
* [network/ssl] fix build error if TLSEXT is disabled

@ -1296,23 +1296,25 @@ int main (int argc, char **argv) {
if (con->state == CON_STATE_READ ||
con->state == CON_STATE_READ_POST) {
if (con->request_count == 1) {
if (con->request_count == 1 || con->state == CON_STATE_READ_POST) {
if (srv->cur_ts - con->read_idle_ts > con->conf.max_read_idle) {
/* time - out */
#if 0
log_error_write(srv, __FILE__, __LINE__, "sd",
"connection closed - read-timeout:", con->fd);
#endif
if (con->conf.log_request_handling) {
log_error_write(srv, __FILE__, __LINE__, "sd",
"connection closed - read timeout:", con->fd);
}
connection_set_state(srv, con, CON_STATE_ERROR);
changed = 1;
}
} else {
if (srv->cur_ts - con->read_idle_ts > con->keep_alive_idle) {
/* time - out */
#if 0
log_error_write(srv, __FILE__, __LINE__, "sd",
"connection closed - read-timeout:", con->fd);
#endif
if (con->conf.log_request_handling) {
log_error_write(srv, __FILE__, __LINE__, "sd",
"connection closed - keep-alive timeout:", con->fd);
}
connection_set_state(srv, con, CON_STATE_ERROR);
changed = 1;
}

Loading…
Cancel
Save