Remove unused KeepAliveTimeout directive (Issue #5733)

diff --git a/CHANGES.md b/CHANGES.md
index 4e7fb45fb5e0a6036b24ad365376cee948ad2079..5e5f8600a1d7737955d75c44cf2fafb0da1949c4 100644 (file)
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -72,6 +72,8 @@ Changes in CUPS v2.3.5
 - Fixed a PPD memory leak caused by emulator definitions (OpenPrinting #124)
 - `httpReconnect2` did not reset the socket file descriptor when the TLS
   negotiation failed (Issue #5907)
+- Removed support for the (long deprecated and unused) `KeepAliveTimeout`
+  directive in `cupsd.conf` (Issue #5733)
 
 
 Changes in CUPS v2.3.4

diff --git a/man/cupsd.conf.5 b/man/cupsd.conf.5
index 00b1a22d66af8ef410a5337f516e810a2be0e3ba..6436512696782efdff5162e85df0679f59d1adbf 100644 (file)
--- a/man/cupsd.conf.5
+++ b/man/cupsd.conf.5
@@ -212,11 +212,6 @@ The default is "5".
 \fBKeepAlive No\fR
 Specifies whether to support HTTP keep-alive connections.
 The default is "Yes".
-.\"#KeepAliveTimeout
-.TP 5
-\fBKeepAliveTimeout \fIseconds\fR
-Specifies how long an idle client connection remains open.
-The default is "30".
 .\"#LimitIPP
 .TP 5
 \fB<Limit \fIoperation \fR...\fB> \fR... \fB</Limit>\fR

diff --git a/scheduler/conf.c b/scheduler/conf.c
index bb6049b2c6ce28483ceaf21bf707d53fe6d8dca2..1180ac9b81f87bf98b274ea20addb90631790c92 100644 (file)
--- a/scheduler/conf.c
+++ b/scheduler/conf.c
@@ -95,7 +95,6 @@ static const cupsd_var_t      cupsd_vars[] =
   { "JobKillDelay",            &JobKillDelay,          CUPSD_VARTYPE_TIME },
   { "JobRetryLimit",           &JobRetryLimit,         CUPSD_VARTYPE_INTEGER },
   { "JobRetryInterval",                &JobRetryInterval,      CUPSD_VARTYPE_TIME },
-  { "KeepAliveTimeout",                &KeepAliveTimeout,      CUPSD_VARTYPE_TIME },
   { "KeepAlive",               &KeepAlive,             CUPSD_VARTYPE_BOOLEAN },
 #ifdef HAVE_LAUNCHD
   { "LaunchdTimeout",          &IdleExitTimeout,       CUPSD_VARTYPE_TIME },
@@ -719,7 +718,6 @@ cupsdReadConfiguration(void)
   FilterNice               = 0;
   HostNameLookups          = FALSE;
   KeepAlive                = TRUE;
-  KeepAliveTimeout         = DEFAULT_KEEPALIVE;
   ListenBackLog            = SOMAXCONN;
   LogDebugHistory          = 200;
   LogFilePerm              = CUPS_DEFAULT_LOG_FILE_PERM;

diff --git a/scheduler/conf.h b/scheduler/conf.h
index b4e14eed99d157b2c1e02c1e4708ca85f08678f4..791c0d360cbcb76d35985c9dc927f49b41329037 100644 (file)
--- a/scheduler/conf.h
+++ b/scheduler/conf.h
@@ -199,8 +199,6 @@ VAR int                     MaxClients              VALUE(100),
                                        /* Timeout during requests */
                        KeepAlive               VALUE(TRUE),
                                        /* Support the Keep-Alive option? */
-                       KeepAliveTimeout        VALUE(DEFAULT_KEEPALIVE),
-                                       /* Timeout between requests */
                        FileDevice              VALUE(FALSE),
                                        /* Allow file: devices? */
                        FilterLimit             VALUE(0),