From: Matthias Wachs <wachs@net.in.tum.de>
Date: Tue, 4 May 2010 08:47:51 +0000 (+0000)
Subject: (no commit message)
X-Git-Tag: initial-import-from-subversion-38251~21902
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=db9926f66da9571020fba8f1f2fa0014d1b65b0f;p=oweals%2Fgnunet.git

---

diff --git a/src/transport/plugin_transport_http.c b/src/transport/plugin_transport_http.c
index 52a6ff0dc..08aba3a14 100644
--- a/src/transport/plugin_transport_http.c
+++ b/src/transport/plugin_transport_http.c
@@ -346,7 +346,7 @@ libgnunet_plugin_transport_http_init (void *cls)
     {
       if ( use_ipv6 == GNUNET_YES)
         {
-          GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"HTTP Daemon could not started, http plugin not working\n");
+          GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"Starting MHD on port %u with IPv6 enabled\n",port);
           http_daemon = MHD_start_daemon (MHD_USE_IPv6,
                                          port,
                                          &acceptPolicyCallback,
@@ -386,13 +386,13 @@ libgnunet_plugin_transport_http_init (void *cls)
 
   curl_multi = curl_multi_init ();
 
-  if ( (NULL != http_daemon) && (NULL != curl_multi))
-    return api;
-  else
+  if ( (NULL == http_daemon) || (NULL == curl_multi))
   {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,"Initializing http plugin failed\n");
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"Initializing http plugin failed\n");
     return NULL;
   }
+  else
+    return api;
 }
 
 
diff --git a/src/transport/test_plugin_transport_http.c b/src/transport/test_plugin_transport_http.c
index 76e4f64f6..91ed4327f 100644
--- a/src/transport/test_plugin_transport_http.c
+++ b/src/transport/test_plugin_transport_http.c
@@ -231,13 +231,13 @@ run (void *cls,
   api = GNUNET_PLUGIN_load (libname, &env);
   if (api != NULL )
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Loading transport plugin for http `%s' successful\n",libname);
+              "Loading http transport plugin `%s' was successful\n",libname);
 
   GNUNET_free (libname);
   if (api == NULL)
     {
       GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                  _("Failed to load transport plugin for http\n"));
+                  _("Failed to load http transport plugin\n"));
       /* FIXME: set some error code for main */
       return;
     }