]> git.ipfire.org Git - thirdparty/squid.git/commitdiff
TLS: failure of https:// context non-fatal for non-OpenSSL builds
authorAmos Jeffries <squid3@treenet.co.nz>
Sat, 22 Aug 2015 19:06:46 +0000 (12:06 -0700)
committerAmos Jeffries <squid3@treenet.co.nz>
Sat, 22 Aug 2015 19:06:46 +0000 (12:06 -0700)
Only OpenSSL library is 'guaranteed' to produce a TLS context at this point
in the conversion to library-agnostic security. Any others may produce
nothing.

Match the DBG_IMPORTANT used for debug level of the 'initializing' message.

src/cache_cf.cc

index 6f2a87e11a3603900baa8bb178205dfe5a47a1c5..3b870684ee11ab8cc969df2462fab18ffba630bb 100644 (file)
@@ -869,8 +869,11 @@ configDoConfigure(void)
         debugs(3, DBG_IMPORTANT, "Initializing https:// proxy context");
         Config.ssl_client.sslContext = Security::ProxyOutgoingConfig.createClientContext(false);
         if (!Config.ssl_client.sslContext) {
-            debugs(3, DBG_CRITICAL, "ERROR: Could not initialize https:// proxy context");
-            self_destruct();
+#if USE_OPENSSL
+            fatal("ERROR: Could not initialize https:// proxy context");
+#else
+            debugs(3, DBG_IMPORTANT, "ERROR: proxying https:// currently still requires --with-openssl");
+#endif
         }
     }