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 5e250b716d09f0c5f36e2a47bb452abe70800ea6..8850f352315e88149dd8a6cdbe66d82fafd7b58e 100644 (file)
--- a/doc/help/man-cupsd.conf.html
+++ b/doc/help/man-cupsd.conf.html
@@ -294,7 +294,7 @@ The <i>DenyTLS1.0</i> option disables TLS v1.0 support - this sets the minimum p
 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.man.in b/man/cupsd.conf.man.in
index a937591525a97938027d11e3069498b635e8d255..97bf87917901ec8e768d4563f00fd29bcc23f5dc 100644 (file)
--- a/man/cupsd.conf.man.in
+++ b/man/cupsd.conf.man.in
@@ -10,7 +10,7 @@
 .\" which should have been included with this file.  If this file is
 .\" file is missing or damaged, see the license at "http://www.cups.org/".
 .\"
-.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
@@ -459,7 +459,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 4bb4c144b6ad555ba4fbb0dc42493bf7e6ceb0fa..11c94d2e4bfa8d8710689fdff7ff0e70e1dc99c2 100644 (file)
--- a/scheduler/conf.c
+++ b/scheduler/conf.c
@@ -1,7 +1,7 @@
 /*
  * Configuration routines for the CUPS scheduler.
  *
- * Copyright © 2007-2018 by Apple Inc.
+ * Copyright © 2007-2019 by Apple Inc.
  * Copyright © 1997-2007 by Easy Software Products, all rights reserved.
  *
  * These coded instructions, statements, and computer programs are the
@@ -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);