diff options
author | Christian Grothoff <christian@grothoff.org> | 2016-10-12 20:26:24 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2016-10-12 20:26:24 +0000 |
commit | 7f066040d65610235f02da2b64c526e75eb54a05 (patch) | |
tree | cafdba2cc26bb0fc399628c72eba648688edbfba | |
parent | 9371fa2437cdac5abe624670b528da859a0a0025 (diff) | |
download | gnunet-7f066040d65610235f02da2b64c526e75eb54a05.tar.gz gnunet-7f066040d65610235f02da2b64c526e75eb54a05.zip |
revert to MHD_USE_SSL for now
-rw-r--r-- | po/POTFILES.in | 5 | ||||
-rw-r--r-- | src/gns/gnunet-gns-proxy.c | 2 | ||||
-rw-r--r-- | src/include/gnunet_common.h | 5 | ||||
-rw-r--r-- | src/transport/plugin_transport_http_server.c | 2 |
4 files changed, 2 insertions, 12 deletions
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 | |||
102 | src/dht/gnunet-service-dht_routing.c | 102 | src/dht/gnunet-service-dht_routing.c |
103 | src/dht/gnunet-service-wdht.c | 103 | src/dht/gnunet-service-wdht.c |
104 | src/dht/gnunet-service-wdht_clients.c | 104 | src/dht/gnunet-service-wdht_clients.c |
105 | src/dht/gnunet-service-wdht_datacache.c | ||
106 | src/dht/gnunet-service-wdht_neighbours.c | 105 | src/dht/gnunet-service-wdht_neighbours.c |
107 | src/dht/gnunet-service-wdht_nse.c | ||
108 | src/dht/gnunet-service-xdht.c | 106 | src/dht/gnunet-service-xdht.c |
109 | src/dht/gnunet-service-xdht_clients.c | ||
110 | src/dht/gnunet-service-xdht_datacache.c | ||
111 | src/dht/gnunet-service-xdht_hello.c | 107 | src/dht/gnunet-service-xdht_hello.c |
112 | src/dht/gnunet-service-xdht_neighbours.c | 108 | src/dht/gnunet-service-xdht_neighbours.c |
113 | src/dht/gnunet-service-xdht_nse.c | ||
114 | src/dht/gnunet-service-xdht_routing.c | 109 | src/dht/gnunet-service-xdht_routing.c |
115 | src/dht/plugin_block_dht.c | 110 | src/dht/plugin_block_dht.c |
116 | src/dns/dns_api.c | 111 | 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) | |||
2302 | hd->is_ssl = GNUNET_YES; | 2302 | hd->is_ssl = GNUNET_YES; |
2303 | hd->domain = GNUNET_strdup (domain); | 2303 | hd->domain = GNUNET_strdup (domain); |
2304 | hd->proxy_cert = pgc; | 2304 | hd->proxy_cert = pgc; |
2305 | hd->daemon = MHD_start_daemon (MHD_USE_DEBUG | MHD_USE_TLS | MHD_USE_NO_LISTEN_SOCKET, | 2305 | hd->daemon = MHD_start_daemon (MHD_USE_DEBUG | MHD_USE_SSL | MHD_USE_NO_LISTEN_SOCKET, |
2306 | 0, | 2306 | 0, |
2307 | NULL, NULL, | 2307 | NULL, NULL, |
2308 | &create_response, hd, | 2308 | &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" | |||
68 | */ | 68 | */ |
69 | #define GNUNET_UTIL_VERSION 0x000A0101 | 69 | #define GNUNET_UTIL_VERSION 0x000A0101 |
70 | 70 | ||
71 | /* support old MHD versions */ | ||
72 | #ifndef MHD_USE_TLS | ||
73 | #define MHD_USE_TLS MHD_USE_SSL | ||
74 | #endif | ||
75 | |||
76 | 71 | ||
77 | /** | 72 | /** |
78 | * Named constants for return values. The following invariants hold: | 73 | * 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, | |||
2200 | MHD_USE_DEBUG | | 2200 | MHD_USE_DEBUG | |
2201 | #endif | 2201 | #endif |
2202 | #if BUILD_HTTPS | 2202 | #if BUILD_HTTPS |
2203 | MHD_USE_TLS | | 2203 | MHD_USE_SSL | |
2204 | #endif | 2204 | #endif |
2205 | MHD_USE_SUSPEND_RESUME | | 2205 | MHD_USE_SUSPEND_RESUME | |
2206 | v6, | 2206 | v6, |