]> git.ipfire.org Git - thirdparty/squid.git/commitdiff
SNI to ICAP via 2nd CONNECT part2
authorChristos Tsantilas <chtsanti@users.sourceforge.net>
Mon, 14 Sep 2015 18:02:04 +0000 (21:02 +0300)
committerChristos Tsantilas <chtsanti@users.sourceforge.net>
Mon, 14 Sep 2015 18:02:04 +0000 (21:02 +0300)
Wrap inside #if USE_OPENSSL/#endif the SSL related code to allow squid build
when openSSL library is disabled.

src/client_side.cc

index 539cc7c578f11b861429a8dc959515576b357d1a..cc2d20c7bc1d422d5522d546d32875972d8d6d26 100644 (file)
@@ -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)));
     }