From: Michael R Sweet Date: Wed, 1 May 2019 18:39:52 +0000 (-0400) Subject: Increase the MultipleOperationTimeOut default to 15 minutes, log an error if X-Git-Tag: v2.2.12~25 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c1b133728b4624e73f658b48a8308ec049ae4e6b;p=thirdparty%2Fcups.git 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 722cfbb189..f93f84d134 100644 --- 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 4ba6ecf8f6..5e250b716d 100644 --- 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).
MultipleOperationTimeout seconds
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 name> ... </Policy>
Specifies access control for the named policy.
Port number @@ -601,7 +601,7 @@ Require authentication for accesses from outside the 10. network: subscriptions.conf(5), CUPS Online Help (http://localhost:631/help)

Copyright

-Copyright © 2007-2018 by Apple Inc. +Copyright © 2007-2019 by Apple Inc. diff --git a/man/cupsd.conf.man.in b/man/cupsd.conf.man.in index 15a5fa9e64..a937591525 100644 --- 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 \fR... \fB\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 9c1be70899..4bb4c144b6 100644 --- 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 8218bfdc45..17001936f9 100644 --- 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."); } /*