[GNUnet-SVN] r26294 - in libmicrohttpd: . src/daemon

[gnunet]

Author: grothoff
Date: 2013-03-04 13:47:09 +0100 (Mon, 04 Mar 2013)
New Revision: 26294

Modified:
   libmicrohttpd/ChangeLog
   libmicrohttpd/src/daemon/connection_https.c
Log:
fix #2802

Modified: libmicrohttpd/ChangeLog
===================================================================
--- libmicrohttpd/ChangeLog     2013-03-04 11:01:29 UTC (rev 26293)
+++ libmicrohttpd/ChangeLog     2013-03-04 12:47:09 UTC (rev 26294)
@@ -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

Modified: libmicrohttpd/src/daemon/connection_https.c
===================================================================
--- libmicrohttpd/src/daemon/connection_https.c 2013-03-04 11:01:29 UTC (rev 
26293)
+++ libmicrohttpd/src/daemon/connection_https.c 2013-03-04 12:47:09 UTC (rev 
26294)
@@ -138,7 +138,7 @@
             __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)