From: Daniel Stenberg <daniel@haxx.se>
Date: Fri, 5 May 2006 22:14:40 +0000 (+0000)
Subject: Curl_https_getsock() was OpenSSL-specific and really should not be present
X-Git-Tag: curl-7_15_4~55
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b62c230ca26b8080b3b5be8f42b48a6fa733d716;p=thirdparty%2Fcurl.git

Curl_https_getsock() was OpenSSL-specific and really should not be present
like this in this source file. The quickfix for now is to provide a simple
version for GnuTLS builds. The GnuTLS version of libcurl doesn't yet allow
fully non-blocking connects anyway so this function doesn't get used.
---

diff --git a/lib/http.c b/lib/http.c
index 3b6d579772..b1995e61ef 100644
--- a/lib/http.c
+++ b/lib/http.c
@@ -1415,6 +1415,8 @@ CURLcode Curl_https_connecting(struct connectdata *conn, bool *done)
 }
 
 #ifdef USE_SSLEAY
+/* This function is OpenSSL-specific. It should be made to query the generic
+   SSL layer instead. */
 int Curl_https_getsock(struct connectdata *conn,
                        curl_socket_t *socks,
                        int numsocks)
@@ -1438,6 +1440,18 @@ int Curl_https_getsock(struct connectdata *conn,
   }
   return CURLE_OK;
 }
+#else
+#ifdef USE_GNUTLS
+int Curl_https_getsock(struct connectdata *conn,
+                       curl_socket_t *socks,
+                       int numsocks)
+{
+  (void)conn;
+  (void)socks;
+  (void)numsocks;
+  return GETSOCK_BLANK;
+}
+#endif
 #endif
 
 /*