revert to MHD_USE_SSL for now

diff --git a/po/POTFILES.in b/po/POTFILES.in
index 6c39471bb3802689aa337645e4f3fa7758907c4e..3fe957b95fefa76982ce86bb0882ebeb58928bfd 100644 (file)
--- 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 477444919554d9a7f4428a5d4d722855c8b6ad03..ef9c7bf6262290cee19b9a41a8964a139228cb75 100644 (file)
--- 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 4a5051c531a4d5427810266aa82001fd4794f600..dcd0c605685697ebbd7e8054ba7d3b363c7a7ddb 100644 (file)
--- 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 1a2f5d21a8251f19eb95de9923ac502c209f81e0..5088f2e774e83fee43cc43bba1305f2c5279fce8 100644 (file)
--- 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,