From: Alex Rousskov <rousskov@measurement-factory.com>
Date: Wed, 14 Dec 2011 17:44:20 +0000 (-0700)
Subject: Notice ssl-bump flag in https_port when determining whether to start ssl_crtd.
X-Git-Tag: BumpSslServerFirst.take01~6
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e6332d28b5a1d4ea8ebd9d7eedc538c45a3a71a2;p=thirdparty%2Fsquid.git

Notice ssl-bump flag in https_port when determining whether to start ssl_crtd.
---

diff --git a/src/ssl/helper.cc b/src/ssl/helper.cc
index b6e16e9fea..0deea592e7 100644
--- a/src/ssl/helper.cc
+++ b/src/ssl/helper.cc
@@ -28,15 +28,12 @@ void Ssl::Helper::Init()
 {
     assert(ssl_crtd == NULL);
 
-    bool useSslBump = false;
-    for (http_port_list *s = ::Config.Sockaddr.http; s; s = s->next) {
-        if (s->sslBump) {
-            useSslBump = true;
-            break;
-        }
-    }
-
-    if (!useSslBump)
+    bool found = false;
+    for (http_port_list *s = ::Config.Sockaddr.http; s && !found; s = s->next)
+        found = s->sslBump;
+    for (http_port_list *s = ::Config.Sockaddr.https; s && !found; s = s->next)
+        found = s->sslBump;
+    if (!found)
         return;
 
     ssl_crtd = new helper("ssl_crtd");