Author: Henrik Nordstrom <henrik@henriknordstrom.net>

Bug #2407: Spelling error in http_port tcpkeepalive option

One of the new parameters according to the docs is "keepalive". However, when
using this option you'll get a "Bungled squid.conf in line ...". That's because
when parsing the configuration Squid is looking for the keyword "tcpkeepalive"
instead of "keepalive" as stated in the docs.

Selected to fix the docs instead of code as having it named keepalive is too
easily confused with HTTP keep-alive / persistent connections.

2009-05-25: Also mistakes on spelling of config dump.

diff --git a/src/cache_cf.cc b/src/cache_cf.cc
index 0d9c54226b976c1f72b055680cc6789b2c9db9c6..86d2b4c63c2e6feb01368139268fca0db00f7c89 100644 (file)
--- a/src/cache_cf.cc
+++ b/src/cache_cf.cc
@@ -3175,9 +3175,9 @@ dump_generic_http_port(StoreEntry * e, const char *n, const http_port_list * s)
 
     if (s->tcp_keepalive.enabled) {
         if (s->tcp_keepalive.idle || s->tcp_keepalive.interval || s->tcp_keepalive.timeout) {
-            storeAppendPrintf(e, " tcp_keepalive=%d,%d,%d", s->tcp_keepalive.idle, s->tcp_keepalive.interval, s->tcp_keepalive.timeout);
+            storeAppendPrintf(e, " tcpkeepalive=%d,%d,%d", s->tcp_keepalive.idle, s->tcp_keepalive.interval, s->tcp_keepalive.timeout);
         } else {
-            storeAppendPrintf(e, " tcp_keepalive");
+            storeAppendPrintf(e, " tcpkeepalive");
         }
     }
 

diff --git a/src/cf.data.pre b/src/cf.data.pre
index d97a8125a157c563804936fe7807d5950fc72022..30b9421046fecbe5ab51409d4a40d25c1067c72a 100644 (file)
--- a/src/cf.data.pre
+++ b/src/cf.data.pre
@@ -1098,7 +1098,7 @@ DOC_START
           name=        Specifies a internal name for the port. Defaults to
                        the port specification (port or addr:port)
 
-          keepalive[=idle,interval,timeout]
+          tcpkeepalive[=idle,interval,timeout]
                        Enable TCP keepalive probes of idle connections
                        idle is the initial time before TCP starts probing
                        the connection, interval how often to probe, and