Bug 3012 fix: deprecate sslBump and support ssl-bump spelling in http_port

Also adds depricated support for sslbump spelling that was previously
documented in squid.conf but not supported.

diff --git a/src/cache_cf.cc b/src/cache_cf.cc
index c8da2f07929085e9b3bec65c36627b5a585ff071..79309ba84ed2e1423ae84691ba3f34d5bdf5d1d9 100644 (file)
--- a/src/cache_cf.cc
+++ b/src/cache_cf.cc
@@ -3300,7 +3300,11 @@ parse_http_port_option(http_port_list * s, char *token)
             t = strchr(t, ',');
         }
 #if USE_SSL
-    } else if (strcmp(token, "sslBump") == 0) {
+    } else if (strcasecmp(token, "sslBump") == 0) {
+        debugs(3, DBG_CRITICAL, "WARNING: '" << token << "' is deprecated " <<
+           "in http_port. Use 'ssl-bump' instead.");
+        s->sslBump = 1; // accelerated when bumped, otherwise not
+    } else if (strcmp(token, "ssl-bump") == 0) {
         s->sslBump = 1; // accelerated when bumped, otherwise not
     } else if (strncmp(token, "cert=", 5) == 0) {
         safe_free(s->cert);

diff --git a/src/cf.data.pre b/src/cf.data.pre
index 6d213ea6d3ff095e619652dae1e4305eee2b1f0f..0d63f7903c86cd36eecc48e019f41e2fd0c61030 100644 (file)
--- a/src/cf.data.pre
+++ b/src/cf.data.pre
@@ -1221,7 +1221,7 @@ DOC_START
           accel        Accelerator mode. Also needs at least one of
                        vhost / vport / defaultsite.
 
-          sslbump      Intercept each CONNECT request matching ssl_bump ACL,
+          ssl-bump     Intercept each CONNECT request matching ssl_bump ACL,
                        establish secure connection with the client and with
                        the server, decrypt HTTP messages as they pass through
                        Squid, and treat them as unencrypted HTTP messages,