[GNUnet-SVN] r37853 - gnunet/src/gns

[gnunet]

Author: schanzen
Date: 2016-08-31 17:42:39 +0200 (Wed, 31 Aug 2016)
New Revision: 37853

Modified:
   gnunet/src/gns/gnunet-gns-proxy.c
Log:
-only check ssl cert once

Modified: gnunet/src/gns/gnunet-gns-proxy.c
===================================================================
--- gnunet/src/gns/gnunet-gns-proxy.c   2016-08-31 12:01:53 UTC (rev 37852)
+++ gnunet/src/gns/gnunet-gns-proxy.c   2016-08-31 15:42:39 UTC (rev 37853)
@@ -875,7 +875,7 @@
   const char *name;
   
   s5r->ssl_checked = GNUNET_YES;
-
+  GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "XXXXXX\n");
   if (CURLE_OK !=
       curl_easy_getinfo (s5r->curl,
                         CURLINFO_TLS_SESSION,
@@ -1041,10 +1041,12 @@
   char *tok;
   
   /* first, check SSL certificate */
-  if ( (GNUNET_YES != s5r->ssl_checked) &&
-       (HTTPS_PORT == s5r->port) &&
-       (GNUNET_OK != check_ssl_certificate (s5r)) )
-    return GNUNET_SYSERR;
+  if ((GNUNET_YES != s5r->ssl_checked) &&
+      (HTTPS_PORT == s5r->port))
+  {
+      if (GNUNET_OK != check_ssl_certificate (s5r))
+        return 0;
+  }
   
   ndup = GNUNET_strndup (buffer, bytes);
   hdr_type = strtok (ndup, ":");
@@ -1775,7 +1777,6 @@
     *upload_data_size -= left;
     GNUNET_assert (NULL != s5r->curl);
     curl_easy_pause (s5r->curl, CURLPAUSE_CONT);
-    curl_download_prepare ();
     return MHD_YES;
   }
   if (SOCKS5_SOCKET_UPLOAD_STARTED == s5r->state)
@@ -1783,7 +1784,6 @@
     GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
                 "Finished processing UPLOAD\n");
     s5r->state = SOCKS5_SOCKET_UPLOAD_DONE;
-    curl_download_prepare ();
   }
   if (NULL == s5r->response)
     return MHD_YES;