[GNUnet-SVN] r26060 - in gnunet/src: hostlist transport

[gnunet]

Author: grothoff
Date: 2013-02-10 00:06:46 +0100 (Sun, 10 Feb 2013)
New Revision: 26060

Modified:
   gnunet/src/hostlist/hostlist-client.c
   gnunet/src/transport/plugin_transport_http_client.c
Log:
-restrict curl accesses to http, disable redirect for http plugins

Modified: gnunet/src/hostlist/hostlist-client.c
===================================================================
--- gnunet/src/hostlist/hostlist-client.c       2013-02-09 18:21:19 UTC (rev 
26059)
+++ gnunet/src/hostlist/hostlist-client.c       2013-02-09 23:06:46 UTC (rev 
26060)
@@ -924,6 +924,8 @@
     return;
   }
   CURL_EASY_SETOPT (curl, CURLOPT_FOLLOWLOCATION, 1);
+  CURL_EASY_SETOPT (curl, CURLOPT_REDIR_PROTOCOLS, CURLPROTO_HTTP | 
CURLPROTO_HTTPS);
+  CURL_EASY_SETOPT (curl, CURLOPT_PROTOCOLS, CURLPROTO_HTTP | CURLPROTO_HTTPS);
   CURL_EASY_SETOPT (curl, CURLOPT_MAXREDIRS, 4);
   /* no need to abort if the above failed */
   CURL_EASY_SETOPT (curl, CURLOPT_URL, current_url);

Modified: gnunet/src/transport/plugin_transport_http_client.c
===================================================================
--- gnunet/src/transport/plugin_transport_http_client.c 2013-02-09 18:21:19 UTC 
(rev 26059)
+++ gnunet/src/transport/plugin_transport_http_client.c 2013-02-09 23:06:46 UTC 
(rev 26060)
@@ -1255,6 +1255,10 @@
 #if CURL_TCP_NODELAY
   curl_easy_setopt (ps->recv_endpoint, CURLOPT_TCP_NODELAY, 1);
 #endif
+  curl_easy_setopt (s->client_get, CURLOPT_FOLLOWLOCATION, 0);
+  curl_easy_setopt (curl, CURLOPT_REDIR_PROTOCOLS, CURLPROTO_HTTP | 
CURLPROTO_HTTPS);
+  curl_easy_setopt (curl, CURLOPT_PROTOCOLS, CURLPROTO_HTTP | CURLPROTO_HTTPS);
+
   mret = curl_multi_add_handle (s->plugin->curl_multi_handle, s->client_get);
   if (mret != CURLM_OK)
   {