Remove non-functional ListenBackLog directive (Apple #5975)

diff --git a/CHANGES.md b/CHANGES.md
index e375ed86592e6e685df344f135ce160c976eeeb8..30012b3ea1799d6355930fd1ab61d1312c134e64 100644 (file)
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -71,8 +71,8 @@ CUPS v2.4-b1 (Pending)
 - Deprecated cups-config (Issue #97)
 - Deprecated Kerberos (`AuthType Negotiate`) authentication (Issue #98)
 - Removed support for the (long deprecated and unused) `FontPath`,
-  `LPDConfigFile`, `KeepAliveTimeout`, `RIPCache`, and `SMBConfigFile`
-  directives in `cupsd.conf` and `cups-files.conf`.
+  `ListenBackLog`, `LPDConfigFile`, `KeepAliveTimeout`, `RIPCache`, and
+  `SMBConfigFile` directives in `cupsd.conf` and `cups-files.conf`.
 - Stubbed out deprecated `httpMD5` functions.
 
 

diff --git a/doc/help/man-cupsd.conf.html b/doc/help/man-cupsd.conf.html
index 8f077e842781374bd96cc109c5da5526331140c9..73e24c51e5e7ee6e730cba61041a8b90426c4d28 100644 (file)
--- a/doc/help/man-cupsd.conf.html
+++ b/doc/help/man-cupsd.conf.html
@@ -158,11 +158,6 @@ The default is "0" which disables the limit check.
 Multiple Listen directives can be provided to listen on multiple addresses.
 The Listen directive is similar to the Port directive but allows you to restrict access to specific interfaces or networks.
 Note: "Listen *:<i>port</i>" and "Port <i>port</i>" effectively listen on all IP addresses, so you cannot combine them with Listen directives for explicit IPv4 or IPv6 addresses on the same port.
-<dt><a name="ListenBackLog"></a><b>ListenBackLog </b><i>number</i>
-<dd style="margin-left: 5.0em">Specifies the number of pending connections that will be allowed.
-This normally only affects very busy servers that have reached the MaxClients limit, but can also be triggered by large numbers of simultaneous connections.
-When the limit is reached, the operating system will refuse additional connections until the scheduler can accept the pending ones.
-The default is the OS-defined default limit, typically either "5" for older operating systems or "128" for newer operating systems.
 <dt><a name="Location"></a><b>&lt;Location </b><i>/path</i><b>> </b>... <b>&lt;/Location></b>
 <dd style="margin-left: 5.0em">Specifies access control for the named location.
 Paths are documented below in the section "LOCATION PATHS".

diff --git a/man/cupsd.conf.5 b/man/cupsd.conf.5
index 1d50523b59fc6ffd1047e0d4865c86205e1988e1..ac8241539623fc9a7fe5a34eae23f4d2cb9e20ed 100644 (file)
--- a/man/cupsd.conf.5
+++ b/man/cupsd.conf.5
@@ -8,7 +8,7 @@
 .\" Licensed under Apache License v2.0.  See the file "LICENSE" for more
 .\" information.
 .\"
-.TH cupsd.conf 5 "CUPS" "2021-04-27" "OpenPrinting"
+.TH cupsd.conf 5 "CUPS" "2021-10-01" "OpenPrinting"
 .SH NAME
 cupsd.conf \- server configuration file for cups
 .SH DESCRIPTION
@@ -236,13 +236,6 @@ Listens to the specified address and port or domain socket path for connections.
 Multiple Listen directives can be provided to listen on multiple addresses.
 The Listen directive is similar to the Port directive but allows you to restrict access to specific interfaces or networks.
 Note: "Listen *:\fIport\fR" and "Port \fIport\fR" effectively listen on all IP addresses, so you cannot combine them with Listen directives for explicit IPv4 or IPv6 addresses on the same port.
-.\"#ListenBackLog
-.TP 5
-\fBListenBackLog \fInumber\fR
-Specifies the number of pending connections that will be allowed.
-This normally only affects very busy servers that have reached the MaxClients limit, but can also be triggered by large numbers of simultaneous connections.
-When the limit is reached, the operating system will refuse additional connections until the scheduler can accept the pending ones.
-The default is the OS-defined default limit, typically either "5" for older operating systems or "128" for newer operating systems.
 .\"#Location
 .TP 5
 \fB<Location \fI/path\fB> \fR... \fB</Location>\fR

diff --git a/scheduler/client.h b/scheduler/client.h
index 7092bdfbc14fda060cf185c7bb984cf59af12b34..1c013d44218de7a69c2c3baa97eae58a001b43f8 100644 (file)
--- a/scheduler/client.h
+++ b/scheduler/client.h
@@ -90,8 +90,6 @@ typedef struct
 
 VAR int                        LastClientNumber VALUE(0),
                                        /* Last client connection number */
-                       ListenBackLog   VALUE(SOMAXCONN),
-                                       /* Max backlog of pending connections */
                        LocalPort       VALUE(631),
                                        /* Local port to use */
                        RemotePort      VALUE(0);

diff --git a/scheduler/conf.c b/scheduler/conf.c
index 96109ddf4a4b316aa36a7c3232929b08f99db0c5..5d167e0fe8102b867833d9482033f93e35d9bbc7 100644 (file)
--- a/scheduler/conf.c
+++ b/scheduler/conf.c
@@ -101,7 +101,6 @@ static const cupsd_var_t    cupsd_vars[] =
   { "LaunchdTimeout",          &IdleExitTimeout,       CUPSD_VARTYPE_TIME },
 #endif /* HAVE_LAUNCHD */
   { "LimitRequestBody",                &MaxRequestSize,        CUPSD_VARTYPE_INTEGER },
-  { "ListenBackLog",           &ListenBackLog,         CUPSD_VARTYPE_INTEGER },
   { "LogDebugHistory",         &LogDebugHistory,       CUPSD_VARTYPE_INTEGER },
   { "MaxActiveJobs",           &MaxActiveJobs,         CUPSD_VARTYPE_INTEGER },
   { "MaxClients",              &MaxClients,            CUPSD_VARTYPE_INTEGER },
@@ -714,7 +713,6 @@ cupsdReadConfiguration(void)
   FilterNice               = 0;
   HostNameLookups          = FALSE;
   KeepAlive                = TRUE;
-  ListenBackLog            = SOMAXCONN;
   LogDebugHistory          = 200;
   LogFilePerm              = CUPS_DEFAULT_LOG_FILE_PERM;
   LogFileGroup             = Group;