diff options
author | Christian Grothoff <christian@grothoff.org> | 2012-01-19 16:47:20 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2012-01-19 16:47:20 +0000 |
commit | 19c33f86184fb2cc8fdcc18fd5693bccade52e64 (patch) | |
tree | b232bac0b59b4a5dda496b4270787a94589369b5 /src | |
parent | b54d68ff219a354920cf650bbb5418c5c2af5b66 (diff) | |
download | libmicrohttpd-19c33f86184fb2cc8fdcc18fd5693bccade52e64.tar.gz libmicrohttpd-19c33f86184fb2cc8fdcc18fd5693bccade52e64.zip |
tclaveirole: fixing #2085 with patch from the bugreport
Diffstat (limited to 'src')
-rw-r--r-- | src/daemon/daemon.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/daemon/daemon.c b/src/daemon/daemon.c index 47c7c527..e09fdbc9 100644 --- a/src/daemon/daemon.c +++ b/src/daemon/daemon.c | |||
@@ -1219,14 +1219,15 @@ MHD_get_timeout (struct MHD_Daemon *daemon, | |||
1219 | while (pos != NULL) | 1219 | while (pos != NULL) |
1220 | { | 1220 | { |
1221 | if (0 != pos->connection_timeout) { | 1221 | if (0 != pos->connection_timeout) { |
1222 | have_timeout = MHD_YES; | 1222 | if (!have_timeout || |
1223 | if (earliest_deadline > pos->last_activity + pos->connection_timeout) | 1223 | earliest_deadline > pos->last_activity + pos->connection_timeout) |
1224 | earliest_deadline = pos->last_activity + pos->connection_timeout; | 1224 | earliest_deadline = pos->last_activity + pos->connection_timeout; |
1225 | #if HTTPS_SUPPORT | 1225 | #if HTTPS_SUPPORT |
1226 | if ( (0 != (daemon->options & MHD_USE_SSL)) && | 1226 | if ( (0 != (daemon->options & MHD_USE_SSL)) && |
1227 | (0 != gnutls_record_check_pending (pos->tls_session)) ) | 1227 | (0 != gnutls_record_check_pending (pos->tls_session)) ) |
1228 | earliest_deadline = 0; | 1228 | earliest_deadline = 0; |
1229 | #endif | 1229 | #endif |
1230 | have_timeout = MHD_YES; | ||
1230 | } | 1231 | } |
1231 | pos = pos->next; | 1232 | pos = pos->next; |
1232 | } | 1233 | } |