Increase the MultipleOperationTimeOut default to 15 minutes, log an error if

the job submission times out (Issue #5570)

diff --git a/CHANGES.md b/CHANGES.md
index 722cfbb189fbaecd37a21e70c6a9934eee0ae428..f93f84d134d91bc12e6d7fb58603f9b53ef54aa3 100644 (file)
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,4 +1,4 @@
-CHANGES - 2.2.12 - 2019-04-15
+CHANGES - 2.2.12 - 2019-05-01
 =============================
 
 
@@ -12,6 +12,7 @@ Changes in CUPS v2.2.12
   for the print filters (Issue #5558)
 - Restored minimal support for the `Emulators` keyword in PPD files to allow
   old Samsung printer drivers to continue to work (Issue #5562)
+- Timed out job submission now yields an error (Issue #5570)
 
 
 Changes in CUPS v2.2.11

diff --git a/doc/help/man-cupsd.conf.html b/doc/help/man-cupsd.conf.html
index 4ba6ecf8f62ff09374de66e1ae14c256932eea19..5e250b716d09f0c5f36e2a47bb452abe70800ea6 100644 (file)
--- a/doc/help/man-cupsd.conf.html
+++ b/doc/help/man-cupsd.conf.html
@@ -219,7 +219,7 @@ The value "0" disables log rotation.
 The default is "1048576" (1MB).
 <dt><a name="MultipleOperationTimeout"></a><b>MultipleOperationTimeout </b><i>seconds</i>
 <dd style="margin-left: 5.0em">Specifies the maximum amount of time to allow between files in a multiple file print job.
-The default is "300" (5 minutes).
+The default is "900" (15 minutes).
 <dt><a name="Policy"></a><b>&lt;Policy </b><i>name</i><b>> </b>... <b>&lt;/Policy></b>
 <dd style="margin-left: 5.0em">Specifies access control for the named policy.
 <dt><a name="Port"></a><b>Port </b><i>number</i>
@@ -601,7 +601,7 @@ Require authentication for accesses from outside the 10. network:
 <a href="man-subscriptions.conf.html?TOPIC=Man+Pages"><b>subscriptions.conf</b>(5),</a>
 CUPS Online Help (<a href="http://localhost:631/help">http://localhost:631/help</a>)
 <h2 class="title"><a name="COPYRIGHT">Copyright</a></h2>
-Copyright &copy; 2007-2018 by Apple Inc.
+Copyright &copy; 2007-2019 by Apple Inc.
 
 </body>
 </html>

diff --git a/man/cupsd.conf.man.in b/man/cupsd.conf.man.in
index 15a5fa9e64d1255b613365a918440cf3601dad00..a937591525a97938027d11e3069498b635e8d255 100644 (file)
--- a/man/cupsd.conf.man.in
+++ b/man/cupsd.conf.man.in
@@ -1,7 +1,7 @@
 .\"
 .\" cupsd.conf man page for CUPS.
 .\"
-.\" Copyright © 2007-2018 by Apple Inc.
+.\" Copyright © 2007-2019 by Apple Inc.
 .\" Copyright © 1997-2006 by Easy Software Products.
 .\"
 .\" These coded instructions, statements, and computer programs are the
@@ -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" "24 April 2018" "Apple Inc."
+.TH cupsd.conf 5 "CUPS" "1 May 2019" "Apple Inc."
 .SH NAME
 cupsd.conf \- server configuration file for cups
 .SH DESCRIPTION
@@ -341,7 +341,7 @@ The default is "1048576" (1MB).
 .TP 5
 \fBMultipleOperationTimeout \fIseconds\fR
 Specifies the maximum amount of time to allow between files in a multiple file print job.
-The default is "300" (5 minutes).
+The default is "900" (15 minutes).
 .\"#Policy
 .TP 5
 \fB<Policy \fIname\fB> \fR... \fB</Policy>\fR
@@ -876,4 +876,4 @@ Require authentication for accesses from outside the 10. network:
 .BR subscriptions.conf (5),
 CUPS Online Help (http://localhost:631/help)
 .SH COPYRIGHT
-Copyright \[co] 2007-2018 by Apple Inc.
+Copyright \[co] 2007-2019 by Apple Inc.

diff --git a/scheduler/conf.c b/scheduler/conf.c
index 9c1be708999d54df6307050fff0913fc04a96453..4bb4c144b6ad555ba4fbb0dc42493bf7e6ceb0fa 100644 (file)
--- a/scheduler/conf.c
+++ b/scheduler/conf.c
@@ -729,7 +729,7 @@ cupsdReadConfiguration(void)
   MaxClientsPerHost        = 0;
   MaxLogSize               = 1024 * 1024;
   MaxRequestSize           = 0;
-  MultipleOperationTimeout = DEFAULT_TIMEOUT;
+  MultipleOperationTimeout = 900;
   NumSystemGroups          = 0;
   ReloadTimeout                   = DEFAULT_KEEPALIVE;
   RootCertDuration         = 300;

diff --git a/scheduler/job.c b/scheduler/job.c
index 8218bfdc455cca4e173c88e4dd9de881d91367bc..17001936f9c66f433a675340671e66a338ceadf1 100644 (file)
--- a/scheduler/job.c
+++ b/scheduler/job.c
@@ -309,8 +309,8 @@ cupsdCheckJobs(void)
          continue;
       }
 
-      cupsdSetJobState(job, IPP_JOB_PENDING, CUPSD_JOB_DEFAULT,
-                       "Job submission timed out.");
+      cupsdSetJobState(job, IPP_JOB_PENDING, CUPSD_JOB_DEFAULT, "Job submission timed out.");
+      cupsdLogJob(job, CUPSD_LOG_ERROR, "Job submission timed out.");
     }
 
    /*