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

[gnunet]

Author: grothoff
Date: 2011-03-30 13:03:33 +0200 (Wed, 30 Mar 2011)
New Revision: 14781

Modified:
   libmicrohttpd/ChangeLog
   libmicrohttpd/src/daemon/daemon.c
   libmicrohttpd/src/examples/digest_auth_example.c
Log:
possible fix for 1670

Modified: libmicrohttpd/ChangeLog
===================================================================
--- libmicrohttpd/ChangeLog     2011-03-30 09:48:52 UTC (rev 14780)
+++ libmicrohttpd/ChangeLog     2011-03-30 11:03:33 UTC (rev 14781)
@@ -1,3 +1,7 @@
+Wed Mar 30 12:56:09 CEST 2011
+       Initialize tv_usec in MHD_USE_THREAD_PER_CONNECTION with select
+       and per-connection timeout. -CG
+
 Tue Mar 29 14:15:13 CEST 2011
        Releasing libmicrohttpd 0.9.9. -CG
 

Modified: libmicrohttpd/src/daemon/daemon.c
===================================================================
--- libmicrohttpd/src/daemon/daemon.c   2011-03-30 09:48:52 UTC (rev 14780)
+++ libmicrohttpd/src/daemon/daemon.c   2011-03-30 11:03:33 UTC (rev 14781)
@@ -581,6 +581,7 @@
            tv.tv_sec = 0;
          else
            tv.tv_sec = timeout - (now - con->last_activity);
+         tv.tv_usec = 0;
          tvp = &tv;
        }
       if ((con->state == MHD_CONNECTION_NORMAL_BODY_UNREADY) ||

Modified: libmicrohttpd/src/examples/digest_auth_example.c
===================================================================
--- libmicrohttpd/src/examples/digest_auth_example.c    2011-03-30 09:48:52 UTC 
(rev 14780)
+++ libmicrohttpd/src/examples/digest_auth_example.c    2011-03-30 11:03:33 UTC 
(rev 14781)
@@ -128,6 +128,7 @@
                         NULL, NULL, &ahc_echo, PAGE,
                        MHD_OPTION_DIGEST_AUTH_RANDOM, sizeof(rnd), rnd,
                        MHD_OPTION_NONCE_NC_SIZE, 300,
+                       MHD_OPTION_CONNECTION_TIMEOUT, (unsigned int) 120,
                        MHD_OPTION_END);
   if (d == NULL)
     return 1;