Don't retry jobs that are canceled at the printer.

git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@9860 7a7537e8-13f0-0310-91df-b6672ffda945

diff --git a/CHANGES.txt b/CHANGES.txt
index 95935d2d4ff0be9adb6b63ae496dabf4e8c38629..d6ccef76942c5c861ead0fc6f502ae45d7ab6d4a 100644 (file)
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,6 +1,11 @@
-CHANGES.txt - 2011-07-25
+CHANGES.txt - 2011-08-02
 ------------------------
 
+CHANGES IN CUPS V1.5.1
+
+       - Jobs canceled at the printer were retried by the IPP backend.
+
+
 CHANGES IN CUPS V1.5.0
 
        - Documentation updates.

diff --git a/backend/ipp.c b/backend/ipp.c
index 6bbc696052670aab66f79a70b41f64bb140f11f1..0ce8beda40e90b5aa208b8ceafa4ba46e065cc63 100644 (file)
--- a/backend/ipp.c
+++ b/backend/ipp.c
@@ -1407,6 +1407,8 @@ main(int  argc,                           /* I - Number of command-line args */
          goto cleanup;
        }
       }
+      else if (ipp_status == IPP_ERROR_JOB_CANCELED)
+        goto cleanup;
       else
       {
        /*