From: Christian Grothoff <christian@grothoff.org>
Date: Wed, 12 Oct 2016 20:26:24 +0000 (+0000)
Subject: revert to MHD_USE_SSL for now
X-Git-Tag: initial-import-from-subversion-38251~108
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=7f066040d65610235f02da2b64c526e75eb54a05;p=oweals%2Fgnunet.git

revert to MHD_USE_SSL for now
---

diff --git a/po/POTFILES.in b/po/POTFILES.in
index 6c39471bb..3fe957b95 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -102,15 +102,10 @@ src/dht/gnunet-service-dht_nse.c
 src/dht/gnunet-service-dht_routing.c
 src/dht/gnunet-service-wdht.c
 src/dht/gnunet-service-wdht_clients.c
-src/dht/gnunet-service-wdht_datacache.c
 src/dht/gnunet-service-wdht_neighbours.c
-src/dht/gnunet-service-wdht_nse.c
 src/dht/gnunet-service-xdht.c
-src/dht/gnunet-service-xdht_clients.c
-src/dht/gnunet-service-xdht_datacache.c
 src/dht/gnunet-service-xdht_hello.c
 src/dht/gnunet-service-xdht_neighbours.c
-src/dht/gnunet-service-xdht_nse.c
 src/dht/gnunet-service-xdht_routing.c
 src/dht/plugin_block_dht.c
 src/dns/dns_api.c
diff --git a/src/gns/gnunet-gns-proxy.c b/src/gns/gnunet-gns-proxy.c
index 477444919..ef9c7bf62 100644
--- a/src/gns/gnunet-gns-proxy.c
+++ b/src/gns/gnunet-gns-proxy.c
@@ -2302,7 +2302,7 @@ lookup_ssl_httpd (const char* domain)
   hd->is_ssl = GNUNET_YES;
   hd->domain = GNUNET_strdup (domain);
   hd->proxy_cert = pgc;
-  hd->daemon = MHD_start_daemon (MHD_USE_DEBUG | MHD_USE_TLS | MHD_USE_NO_LISTEN_SOCKET,
+  hd->daemon = MHD_start_daemon (MHD_USE_DEBUG | MHD_USE_SSL | MHD_USE_NO_LISTEN_SOCKET,
                                  0,
                                  NULL, NULL,
                                  &create_response, hd,
diff --git a/src/include/gnunet_common.h b/src/include/gnunet_common.h
index 4a5051c53..dcd0c6056 100644
--- a/src/include/gnunet_common.h
+++ b/src/include/gnunet_common.h
@@ -68,11 +68,6 @@ extern "C"
  */
 #define GNUNET_UTIL_VERSION 0x000A0101
 
-/* support old MHD versions */
-#ifndef MHD_USE_TLS
-#define MHD_USE_TLS MHD_USE_SSL
-#endif
-
 
 /**
  * Named constants for return values.  The following invariants hold:
diff --git a/src/transport/plugin_transport_http_server.c b/src/transport/plugin_transport_http_server.c
index 1a2f5d21a..5088f2e77 100644
--- a/src/transport/plugin_transport_http_server.c
+++ b/src/transport/plugin_transport_http_server.c
@@ -2200,7 +2200,7 @@ run_mhd_start_daemon (struct HTTP_Server_Plugin *plugin,
                              MHD_USE_DEBUG |
 #endif
 #if BUILD_HTTPS
-                             MHD_USE_TLS |
+                             MHD_USE_SSL |
 #endif
                              MHD_USE_SUSPEND_RESUME |
                              v6,