[GNUnet-SVN] r38144 - in gnunet: po src/gns src/include src/transport

[gnunet]

Author: grothoff
Date: 2016-10-12 22:26:24 +0200 (Wed, 12 Oct 2016)
New Revision: 38144

Modified:
   gnunet/po/POTFILES.in
   gnunet/src/gns/gnunet-gns-proxy.c
   gnunet/src/include/gnunet_common.h
   gnunet/src/transport/plugin_transport_http_server.c
Log:
revert to MHD_USE_SSL for now

Modified: gnunet/po/POTFILES.in
===================================================================
--- gnunet/po/POTFILES.in       2016-10-12 19:58:23 UTC (rev 38143)
+++ gnunet/po/POTFILES.in       2016-10-12 20:26:24 UTC (rev 38144)
@@ -102,15 +102,10 @@
 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

Modified: gnunet/src/gns/gnunet-gns-proxy.c
===================================================================
--- gnunet/src/gns/gnunet-gns-proxy.c   2016-10-12 19:58:23 UTC (rev 38143)
+++ gnunet/src/gns/gnunet-gns-proxy.c   2016-10-12 20:26:24 UTC (rev 38144)
@@ -2302,7 +2302,7 @@
   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,

Modified: gnunet/src/include/gnunet_common.h
===================================================================
--- gnunet/src/include/gnunet_common.h  2016-10-12 19:58:23 UTC (rev 38143)
+++ gnunet/src/include/gnunet_common.h  2016-10-12 20:26:24 UTC (rev 38144)
@@ -68,12 +68,7 @@
  */
 #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:
  * `GNUNET_NO == 0` (to allow `if (GNUNET_NO)`) `GNUNET_OK !=

Modified: gnunet/src/transport/plugin_transport_http_server.c
===================================================================
--- gnunet/src/transport/plugin_transport_http_server.c 2016-10-12 19:58:23 UTC 
(rev 38143)
+++ gnunet/src/transport/plugin_transport_http_server.c 2016-10-12 20:26:24 UTC 
(rev 38144)
@@ -2200,7 +2200,7 @@
                              MHD_USE_DEBUG |
 #endif
 #if BUILD_HTTPS
-                             MHD_USE_TLS |
+                             MHD_USE_SSL |
 #endif
                              MHD_USE_SUSPEND_RESUME |
                              v6,