Author: Alex Rousskov <rousskov@measurement-factory.com>

Bug 3012: 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 3a7a2a44293a47dd5c85848484570faea767ffc8..caf3aa23d5bbe22c97ade60713334a5c1e331c7e 100644 (file)
--- a/src/cache_cf.cc
+++ b/src/cache_cf.cc
@@ -3156,7 +3156,11 @@ parse_http_port_option(http_port_list * s, char *token)
     } else if (strncmp(token, "sslcontext=", 11) == 0) {
         safe_free(s->sslcontext);
         s->sslcontext = xstrdup(token + 11);
-    } 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
 #endif
     } else {

diff --git a/src/cf.data.pre b/src/cf.data.pre
index 3a4bc557d1cb3a72905405f2db211a986acce280..f743f26e23d950f4a291759c4b4eaf68f5367a1e 100644 (file)
--- a/src/cf.data.pre
+++ b/src/cf.data.pre
@@ -1157,7 +1157,7 @@ DOC_START
                        sporadically hang or never complete requests set
                        disable-pmtu-discovery option to 'transparent'.
 
-          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,