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 d08e93708b6ada6b6839f62d6b223f3395295610..f658743f4ef8acf3584009ce04f4c47292cc4dc9 100644 (file)
--- a/src/cache_cf.cc
+++ b/src/cache_cf.cc
@@ -3179,9 +3179,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 6fdf925b0788f8bd77ea8c213f896be44e66f7c7..f8c65037a4cdd180aae1f82b1c6ab46c772326d0 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