Browse Source

Fix linger close timeout handling, drop timeout to 5 seconds (fixes #2086)

git-svn-id: svn://svn.lighttpd.net/lighttpd/branches/lighttpd-1.4.x@2669 152afb58-edef-0310-8abb-c4023f1b3aa9
svn/tags/lighttpd-1.4.24
Stefan Bühler 12 years ago
parent
commit
932b67bd2b
  1. 1
      NEWS
  2. 5
      src/server.c
  3. 2
      src/settings.h

1
NEWS

@ -60,6 +60,7 @@ NEWS
* mod_accesslog: escape special characters (fixes #1551, thx icy)
* fix mod_webdav crash from #1793 (fixes #2084, thx hiroya)
* Don't print ssl error if client didn't support TLS SNI
* Fix linger close timeout handling, drop timeout to 5 seconds (fixes #2086)
- 1.4.23 - 2009-06-19
* Added some extra warning options in cmake and fix the resulting warnings (unused/static functions)

5
src/server.c

@ -1291,6 +1291,11 @@ int main (int argc, char **argv) {
changed = 1;
}
}
if (con->state == CON_STATE_CLOSE && (srv->cur_ts - con->close_timeout_ts > HTTP_LINGER_TIMEOUT)) {
changed = 1;
}
/* we don't like div by zero */
if (0 == (t_diff = srv->cur_ts - con->connection_start)) t_diff = 1;

2
src/settings.h

@ -40,7 +40,7 @@ typedef enum { HANDLER_UNSET,
HANDLER_WAIT_FOR_FD
} handler_t;
#define HTTP_LINGER_TIMEOUT 30
#define HTTP_LINGER_TIMEOUT 5
/* we use it in a enum */
#ifdef TRUE

Loading…
Cancel
Save