Bump the default Timeout to 15 minutes as well (Issue #5570)

diff --git a/doc/help/man-cupsd.conf.html b/doc/help/man-cupsd.conf.html
index 2c7c06e7e60153fc2df628f0dce1c8dc3c1e560f..f889b866f4f4457841e97dcb0e2aa17dfe9a2e6d 100644 (file)
--- a/doc/help/man-cupsd.conf.html
+++ b/doc/help/man-cupsd.conf.html
@@ -299,7 +299,7 @@ Not all operating systems support TLS 1.3 at this time.
 The default is "No".
 <dt><a name="Timeout"></a><b>Timeout </b><i>seconds</i>
 <dd style="margin-left: 5.0em">Specifies the HTTP request timeout.
-The default is "300" (5 minutes).
+The default is "900" (15 minutes).
 <dt><a name="WebInterface"></a><b>WebInterface yes</b>
 <dd style="margin-left: 5.0em"><dt><b>WebInterface no</b>
 <dd style="margin-left: 5.0em">Specifies whether the web interface is enabled.

diff --git a/man/cupsd.conf.5 b/man/cupsd.conf.5
index 9077873649621f0079e5478ebc579cba67b7030b..75d0602790553e7e71553b3fc5a9a1443c3a56a3 100644 (file)
--- a/man/cupsd.conf.5
+++ b/man/cupsd.conf.5
@@ -7,7 +7,7 @@
 .\" Licensed under Apache License v2.0.  See the file "LICENSE" for more
 .\" information.
 .\"
-.TH cupsd.conf 5 "CUPS" "1 May 2019" "Apple Inc."
+.TH cupsd.conf 5 "CUPS" "2 May 2019" "Apple Inc."
 .SH NAME
 cupsd.conf \- server configuration file for cups
 .SH DESCRIPTION
@@ -465,7 +465,7 @@ The default is "No".
 .TP 5
 \fBTimeout \fIseconds\fR
 Specifies the HTTP request timeout.
-The default is "300" (5 minutes).
+The default is "900" (15 minutes).
 .\"#WebInterface
 .TP 5
 \fBWebInterface yes\fR

diff --git a/scheduler/conf.c b/scheduler/conf.c
index 85950a17d2e3202502a38117d35900e5c28e1550..bb6049b2c6ce28483ceaf21bf707d53fe6d8dca2 100644 (file)
--- a/scheduler/conf.c
+++ b/scheduler/conf.c
@@ -736,7 +736,7 @@ cupsdReadConfiguration(void)
   Sandboxing               = CUPSD_SANDBOXING_STRICT;
   StrictConformance        = FALSE;
   SyncOnClose              = FALSE;
-  Timeout                  = DEFAULT_TIMEOUT;
+  Timeout                  = 900;
   WebInterface             = CUPS_DEFAULT_WEBIF;
 
   BrowseLocalProtocols     = parse_protocols(CUPS_DEFAULT_BROWSE_LOCAL_PROTOCOLS);