From: Matthias Wachs <wachs@net.in.tum.de>
Date: Wed, 29 Aug 2012 09:14:49 +0000 (+0000)
Subject: changes
X-Git-Tag: initial-import-from-subversion-38251~12041
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=d85ad86dfc57e5df2f2d0140642d444a46a309da;p=oweals%2Fgnunet.git

changes
---

diff --git a/src/transport/plugin_transport_http_client.c b/src/transport/plugin_transport_http_client.c
index 4e5449e63..1f08d7bbb 100644
--- a/src/transport/plugin_transport_http_client.c
+++ b/src/transport/plugin_transport_http_client.c
@@ -480,7 +480,7 @@ client_disconnect (struct Session *s)
   if (s->client_put != NULL)
   {
     GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name,
-                     "Session %p/connection %p: disconnecting PUT connectionto peer `%s'\n",
+                     "Session %p/connection %p: disconnecting PUT connection to peer `%s'\n",
                      s, s->client_put, GNUNET_i2s (&s->target));
 
     /* remove curl handle from multi handle */
diff --git a/src/transport/test_plugin_transport.c b/src/transport/test_plugin_transport.c
index 3bd0b7cb0..f195d0369 100644
--- a/src/transport/test_plugin_transport.c
+++ b/src/transport/test_plugin_transport.c
@@ -41,7 +41,7 @@
  * How long until we give up on transmitting the message?
  */
 #define WAIT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 5)
-#define TIMEOUT GNUNET_TIME_relative_multiply (WAIT, 3)
+#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 30)
 
 /**
  * Our public key.
@@ -197,6 +197,13 @@ end_badly (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
       GNUNET_SCHEDULER_cancel (timeout_wait);
       timeout_wait = GNUNET_SCHEDULER_NO_TASK;
   }
+
+  if (NULL != cls)
+  {
+      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                _("Test took too long to execute, timeout .... \n"));
+  }
+
   if (NULL != libname)
   {
     if (NULL != api)
@@ -457,7 +464,7 @@ run (void *cls, char *const *args, const char *cfgfile,
   char *plugin;
   char *sep;
 
-  timeout_task = GNUNET_SCHEDULER_add_delayed (TIMEOUT, end_badly, NULL);
+  timeout_task = GNUNET_SCHEDULER_add_delayed (TIMEOUT, end_badly, &ok);
 
   cfg = c;
   /* parse configuration */