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

---

diff --git a/src/transport/plugin_transport_http.c b/src/transport/plugin_transport_http.c
index 9169af5d1..2293e4ba4 100644
--- a/src/transport/plugin_transport_http.c
+++ b/src/transport/plugin_transport_http.c
@@ -42,6 +42,7 @@
 
 #define DEBUG_HTTP GNUNET_NO
 #define DEBUG_CURL GNUNET_NO
+#define DEBUG_MHD GNUNET_YES
 #define DEBUG_CONNECTIONS GNUNET_NO
 #define DEBUG_SESSION_SELECTION GNUNET_NO
 
@@ -2454,7 +2455,7 @@ libgnunet_plugin_transport_http_init (void *cls)
   {
 	struct sockaddr * tmp = (struct sockaddr *) plugin->bind6_address;
     plugin->http_server_daemon_v6 = MHD_start_daemon (
-#if DEBUG_CONNECTIONS
+#if DEBUG_MHD
     								   MHD_USE_DEBUG |
 #endif
     								   MHD_USE_IPv6,
@@ -2473,7 +2474,7 @@ libgnunet_plugin_transport_http_init (void *cls)
   if ((plugin->http_server_daemon_v4 == NULL) && (plugin->use_ipv4 == GNUNET_YES) && (port != 0))
   {
   plugin->http_server_daemon_v4 = MHD_start_daemon (
-#if DEBUG_CONNECTIONS
+#if DEBUG_MHD
     								   MHD_USE_DEBUG |
 #endif
     								   MHD_NO_FLAG,
diff --git a/src/transport/plugin_transport_https.c b/src/transport/plugin_transport_https.c
index fc548868d..088c8f3d8 100644
--- a/src/transport/plugin_transport_https.c
+++ b/src/transport/plugin_transport_https.c
@@ -43,6 +43,7 @@
 
 #define DEBUG_HTTPS GNUNET_NO
 #define VERBOSE GNUNET_NO
+#define DEBUG_MHD GNUNET_YES
 #define DEBUG_CURL GNUNET_NO
 #define DEBUG_CONNECTIONS GNUNET_NO
 #define DEBUG_SESSION_SELECTION GNUNET_NO
@@ -2615,10 +2616,9 @@ libgnunet_plugin_transport_https_init (void *cls)
   {
 	struct sockaddr * tmp = (struct sockaddr *) plugin->bind6_address;
     plugin->http_server_daemon_v6 = MHD_start_daemon (
-
+#if DEBUG_MHD
     								   MHD_USE_DEBUG |
-#if DEBUG_CONNECTIONS
-    								   #endif
+#endif
     								   MHD_USE_IPv6 | MHD_USE_SSL,
                                        port,
                                        &mhd_accept_cb,
@@ -2642,9 +2642,8 @@ libgnunet_plugin_transport_https_init (void *cls)
   if ((plugin->http_server_daemon_v4 == NULL) && (plugin->use_ipv4 == GNUNET_YES) && (port != 0))
   {
   plugin->http_server_daemon_v4 = MHD_start_daemon (
-
+#if DEBUG_MHD
     								   MHD_USE_DEBUG |
-#if DEBUG_CONNECTIONS
 #endif
     								   MHD_NO_FLAG | MHD_USE_SSL,
                                        port,
diff --git a/src/transport/test_transport_api_rel_https_peer1.conf b/src/transport/test_transport_api_rel_https_peer1.conf
index 9098a67df..3ac60d792 100644
--- a/src/transport/test_transport_api_rel_https_peer1.conf
+++ b/src/transport/test_transport_api_rel_https_peer1.conf
@@ -50,7 +50,7 @@ MINIMUM-FRIENDS = 0
 [transport]
 PLUGINS = https
 #PLUGINS = tcp http
-DEBUG = YES
+#DEBUG = YES
 ACCEPT_FROM6 = ::1;
 ACCEPT_FROM = 127.0.0.1;
 NEIGHBOUR_LIMIT = 50
diff --git a/src/transport/test_transport_api_rel_https_peer2.conf b/src/transport/test_transport_api_rel_https_peer2.conf
index 892694a4c..e826e7ebe 100644
--- a/src/transport/test_transport_api_rel_https_peer2.conf
+++ b/src/transport/test_transport_api_rel_https_peer2.conf
@@ -50,7 +50,7 @@ MINIMUM-FRIENDS = 0
 [transport]
 PLUGINS = https
 #PLUGINS = tcp http
-DEBUG = YES
+#DEBUG = YES
 ACCEPT_FROM6 = ::1;
 ACCEPT_FROM = 127.0.0.1;
 NEIGHBOUR_LIMIT = 50