[GNUnet-SVN] r6244 - GNUnet/src/transports

[gnunet]

Author: grothoff
Date: 2008-02-10 23:09:00 -0700 (Sun, 10 Feb 2008)
New Revision: 6244

Modified:
   GNUnet/src/transports/http.c
Log:
fix

Modified: GNUnet/src/transports/http.c
===================================================================
--- GNUnet/src/transports/http.c        2008-02-11 05:36:18 UTC (rev 6243)
+++ GNUnet/src/transports/http.c        2008-02-11 06:09:00 UTC (rev 6244)
@@ -2058,6 +2058,7 @@
       if (mhd_daemon != NULL)
         have_tv = MHD_get_timeout (mhd_daemon, &timeout);
       STEP ();
+
       GNUNET_mutex_lock (curllock);
       if ((CURLM_OK == curl_multi_timeout (curl_multi, &ms)) &&
           (ms != -1) && ((ms < timeout) || (have_tv == MHD_NO)))
@@ -2065,18 +2066,6 @@
           timeout = ms;
           have_tv = MHD_YES;
         }
-      else
-        {
-          /* curl_multi_timeout is buggy, don't believe
-             it --- otherwise we may sit here forever on
-             connect...; this is a bug which can be
-             demonstrated using the daemontest_post_loop
-             testcase from MHD.  Once fixed in CURL, this
-             else-clause should be removed.
-           */
-          timeout = 500;
-          have_tv = MHD_YES;
-        }
       GNUNET_mutex_unlock (curllock);
       STEP ();
       FD_SET (signal_pipe[0], &rs);