From: Amos Jeffries Date: Wed, 18 Aug 2010 01:50:51 +0000 (-0600) Subject: Author: Alex Rousskov X-Git-Tag: SQUID_3_1_7~6 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=94ad6ae8b9a0dd06bd1a6166d5cb6467ef29cf11;p=thirdparty%2Fsquid.git Author: Alex Rousskov 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 3a7a2a4429..caf3aa23d5 100644 --- 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 3a4bc557d1..f743f26e23 100644 --- 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,