[GNUnet-SVN] r12286 - gnunet/src/transport

[gnunet]

Author: wachs
Date: 2010-07-20 14:31:27 +0200 (Tue, 20 Jul 2010)
New Revision: 12286

Modified:
   gnunet/src/transport/plugin_transport_http.c
Log:
FIX: no curl scheduling if no curl handles are running, because this causes 
segfault on sparc machine

Modified: gnunet/src/transport/plugin_transport_http.c
===================================================================
--- gnunet/src/transport/plugin_transport_http.c        2010-07-20 12:24:34 UTC 
(rev 12285)
+++ gnunet/src/transport/plugin_transport_http.c        2010-07-20 12:31:27 UTC 
(rev 12286)
@@ -1439,7 +1439,7 @@
       handles_last_run = running;
     }
   while (mret == CURLM_CALL_MULTI_PERFORM);
-  curl_schedule(plugin);
+  if (running>0) curl_schedule(plugin);
 }
 
 
@@ -1462,6 +1462,7 @@
 
   GNUNET_assert(cls !=NULL);
 
+
   /* Cancel previous scheduled task */
   if (plugin->http_curl_task !=  GNUNET_SCHEDULER_NO_TASK)
   {
@@ -2372,7 +2373,7 @@
                                        plugin , &mdh_access_cb, plugin,
                                        MHD_OPTION_SOCK_ADDR, tmp,
                                        MHD_OPTION_CONNECTION_LIMIT, (unsigned 
int) 32,
-                                       MHD_OPTION_PER_IP_CONNECTION_LIMIT, 
(unsigned int) 6,
+                                       //MHD_OPTION_PER_IP_CONNECTION_LIMIT, 
(unsigned int) 6,
                                        MHD_OPTION_CONNECTION_TIMEOUT, 
(unsigned int) timeout,
                                        MHD_OPTION_CONNECTION_MEMORY_LIMIT, 
(size_t) (16 * 1024),
                                        MHD_OPTION_NOTIFY_COMPLETED, 
&mhd_termination_cb, NULL,
@@ -2390,7 +2391,7 @@
                                        plugin , &mdh_access_cb, plugin,
                                        MHD_OPTION_SOCK_ADDR, (struct 
sockaddr_in *)plugin->bind4_address,
                                        MHD_OPTION_CONNECTION_LIMIT, (unsigned 
int) 32,
-                                       MHD_OPTION_PER_IP_CONNECTION_LIMIT, 
(unsigned int) 6,
+                                       //MHD_OPTION_PER_IP_CONNECTION_LIMIT, 
(unsigned int) 6,
                                        MHD_OPTION_CONNECTION_TIMEOUT, 
(unsigned int) timeout,
                                        MHD_OPTION_CONNECTION_MEMORY_LIMIT, 
(size_t) (16 * 1024),
                                        MHD_OPTION_NOTIFY_COMPLETED, 
&mhd_termination_cb, NULL,