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

[gnunet]

Author: grothoff
Date: 2011-05-25 16:25:00 +0200 (Wed, 25 May 2011)
New Revision: 15303

Modified:
   libmicrohttpd/ChangeLog
   libmicrohttpd/src/daemon/connection.c
Log:
trying to fix timeout issue

Modified: libmicrohttpd/ChangeLog
===================================================================
--- libmicrohttpd/ChangeLog     2011-05-25 12:48:51 UTC (rev 15302)
+++ libmicrohttpd/ChangeLog     2011-05-25 14:25:00 UTC (rev 15303)
@@ -1,3 +1,7 @@
+Wed May 25 14:23:20 CEST 2011
+       Trying to fix stutter problem on timeout described by
+       David Myers on the mailinglist (5/10/2011). -CG
+
 Fri May 20 22:11:55 CEST 2011
        Fixed bug in testcase setup code causing crashes in
        tls_session_timeout_test on some systems.

Modified: libmicrohttpd/src/daemon/connection.c
===================================================================
--- libmicrohttpd/src/daemon/connection.c       2011-05-25 12:48:51 UTC (rev 
15302)
+++ libmicrohttpd/src/daemon/connection.c       2011-05-25 14:25:00 UTC (rev 
15303)
@@ -2281,7 +2281,7 @@
   timeout = connection->daemon->connection_timeout;
   if ((connection->socket_fd != -1) &&
       (timeout != 0) &&
-      (timeout < (time (NULL) - connection->last_activity)) )
+      (timeout <= (time (NULL) - connection->last_activity)) )
     {
       MHD_connection_close (connection, 
MHD_REQUEST_TERMINATED_TIMEOUT_REACHED);
       return MHD_NO;