From: Christos Tsantilas <chtsanti@users.sourceforge.net>
Date: Mon, 14 Sep 2015 18:02:04 +0000 (+0300)
Subject: SNI to ICAP via 2nd CONNECT part2
X-Git-Tag: SQUID_4_0_1~62
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=65e0c910bf48176a5112b7385ae45fa3c62016fe;p=thirdparty%2Fsquid.git

SNI to ICAP via 2nd CONNECT part2

Wrap inside #if USE_OPENSSL/#endif the SSL related code to allow squid build
when openSSL library is disabled.
---

diff --git a/src/client_side.cc b/src/client_side.cc
index 539cc7c578..cc2d20c7bc 100644
--- a/src/client_side.cc
+++ b/src/client_side.cc
@@ -4313,11 +4313,14 @@ ConnStateData::fakeAConnectRequest(const char *reason, const SBuf &payload)
 {
     // fake a CONNECT request to force connState to tunnel
     SBuf connectHost;
+#if USE_OPENSSL
     if (serverBump() && !serverBump()->clientSni.isEmpty()) {
         connectHost.assign(serverBump()->clientSni);
         if (clientConnection->local.port() > 0)
             connectHost.appendf(":%d",clientConnection->local.port());
-    } else {
+    } else
+#endif
+    {
         static char ip[MAX_IPSTRLEN];
         connectHost.assign(clientConnection->local.toUrl(ip, sizeof(ip)));
     }