diff options
author | Christian Grothoff <christian@grothoff.org> | 2013-03-04 12:47:09 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2013-03-04 12:47:09 +0000 |
commit | f6d108e3bced2a30237543c8054d776ebe34689d (patch) | |
tree | 1828d6aaad3bc968fc07497467f9432a2e92a60e | |
parent | 16cab0b43a38181e7b8a7ae669db3c7ab7fe8891 (diff) | |
download | libmicrohttpd-f6d108e3bced2a30237543c8054d776ebe34689d.tar.gz libmicrohttpd-f6d108e3bced2a30237543c8054d776ebe34689d.zip |
fix #2802
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | src/daemon/connection_https.c | 2 |
2 files changed, 6 insertions, 2 deletions
@@ -1,5 +1,9 @@ | |||
1 | Mon Mar 4 13:45:35 CET 2013 | ||
2 | Fix dropping of SSL connections if uptime is less than | ||
3 | MHD_OPTION_CONNECTION_TIMEOUT due to integer underflow (#2802). -greed | ||
4 | |||
1 | Fri Mar 1 01:11:57 CET 2013 | 5 | Fri Mar 1 01:11:57 CET 2013 |
2 | Fully initialize cleanup mutex struct for each thread. -Ulion | 6 | Fully initialize cleanup mutex struct for each thread (#2803). -Ulion |
3 | 7 | ||
4 | Wed Feb 6 01:51:52 CET 2013 | 8 | Wed Feb 6 01:51:52 CET 2013 |
5 | Releasing libmicrohttpd 0.9.25. -CG | 9 | Releasing libmicrohttpd 0.9.25. -CG |
diff --git a/src/daemon/connection_https.c b/src/daemon/connection_https.c index 539b8de5..b0be3ced 100644 --- a/src/daemon/connection_https.c +++ b/src/daemon/connection_https.c | |||
@@ -138,7 +138,7 @@ MHD_tls_connection_handle_idle (struct MHD_Connection *connection) | |||
138 | __FUNCTION__, MHD_state_to_string (connection->state)); | 138 | __FUNCTION__, MHD_state_to_string (connection->state)); |
139 | #endif | 139 | #endif |
140 | timeout = connection->connection_timeout; | 140 | timeout = connection->connection_timeout; |
141 | if ( (timeout != 0) && (MHD_monotonic_time() - timeout > connection->last_activity)) | 141 | if ( (timeout != 0) && (timeout <= (MHD_monotonic_time() - connection->last_activity))) |
142 | MHD_connection_close (connection, | 142 | MHD_connection_close (connection, |
143 | MHD_REQUEST_TERMINATED_TIMEOUT_REACHED); | 143 | MHD_REQUEST_TERMINATED_TIMEOUT_REACHED); |
144 | switch (connection->state) | 144 | switch (connection->state) |