From: Michael R Sweet <michael.r.sweet@gmail.com>
Date: Wed, 7 Apr 2021 21:56:34 +0000 (-0400)
Subject: Remove KeepAliveTimeout directive since it hasn't been wired up for years
X-Git-Tag: v2.4b1~158
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d19ed7886edb1229265dfded40a18e68d1581975;p=thirdparty%2Fcups.git

Remove KeepAliveTimeout directive since it hasn't been wired up for years
(Apple #5733)
---

diff --git a/CHANGES.md b/CHANGES.md
index 29fb40ea26..1128fe5761 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -38,8 +38,8 @@ CUPS v2.4rc1 (Pending)
 - Deprecated cups-config (Issue #97)
 - Deprecated Kerberos (`AuthType Negotiate`) authentication (Issue #98)
 - Removed support for the (long deprecated and unused) `FontPath`,
-  `LPDConfigFile`, `RIPCache`, and `SMBConfigFile` directives in `cupsd.conf`
-  and `cups-files.conf`.
+  `LPDConfigFile`, `KeepAliveTimeout`, `RIPCache`, and `SMBConfigFile`
+  directives in `cupsd.conf` and `cups-files.conf`.
 
 
 CUPS v2.3.3op2 (February 1, 2021)
diff --git a/man/cupsd.conf.5 b/man/cupsd.conf.5
index 58decc8f36..972826ec61 100644
--- a/man/cupsd.conf.5
+++ b/man/cupsd.conf.5
@@ -207,11 +207,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 27256bd0b1..96109ddf4a 100644
--- a/scheduler/conf.c
+++ b/scheduler/conf.c
@@ -96,7 +96,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 },
@@ -715,7 +714,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 adc205a9a7..e72756aa2c 100644
--- a/scheduler/conf.h
+++ b/scheduler/conf.h
@@ -200,8 +200,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),