2 files changed, 6 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 927ce53d..11a5d360 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
+Mon Mar  4 13:45:35 CET 2013
+        Fix dropping of SSL connections if uptime is less than
+        MHD_OPTION_CONNECTION_TIMEOUT due to integer underflow (#2802). -greed
+
 Fri Mar  1 01:11:57 CET 2013
-        Fully initialize cleanup mutex struct for each thread. -Ulion
+        Fully initialize cleanup mutex struct for each thread (#2803). -Ulion
 
 Wed Feb  6 01:51:52 CET 2013
         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)
             __FUNCTION__, MHD_state_to_string (connection->state));
 #endif
   timeout = connection->connection_timeout;
-  if ( (timeout != 0) && (MHD_monotonic_time() - timeout > connection->last_activity))
+  if ( (timeout != 0) && (timeout <= (MHD_monotonic_time() - connection->last_activity)))
     MHD_connection_close (connection,
                           MHD_REQUEST_TERMINATED_TIMEOUT_REACHED);
   switch (connection->state)