]> git.ipfire.org Git - thirdparty/cups.git/commitdiff
Don't retry Send-Document when printing from stdin, reprocess the whole job.
authormike <mike@7a7537e8-13f0-0310-91df-b6672ffda945>
Mon, 29 Oct 2012 16:39:01 +0000 (16:39 +0000)
committermike <mike@7a7537e8-13f0-0310-91df-b6672ffda945>
Mon, 29 Oct 2012 16:39:01 +0000 (16:39 +0000)
git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@10671 7a7537e8-13f0-0310-91df-b6672ffda945

backend/ipp.c

index 0df9730435548fa81c86b521cabae29720aa87f0..09e0be3c25be599b71ff277118ef7f736758ded0 100644 (file)
@@ -1710,7 +1710,21 @@ main(int  argc,                          /* I - Number of command-line args */
     else if (ipp_status == IPP_SERVICE_UNAVAILABLE ||
              ipp_status == IPP_NOT_POSSIBLE ||
             ipp_status == IPP_PRINTER_BUSY)
+    {
+      if (argc == 6)
+      {
+       /*
+        * Need to reprocess the entire job; if we have a job ID, cancel the
+        * job first...
+        */
+
+       if (job_id > 0)
+         cancel_job(http, uri, job_id, resource, argv[2], version);
+
+        goto cleanup;
+      }
       continue;
+    }
     else if (ipp_status == IPP_REQUEST_VALUE ||
              ipp_status == IPP_ERROR_JOB_CANCELED ||
              ipp_status == IPP_NOT_AUTHORIZED ||