From: msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be>
Date: Wed, 19 Nov 2014 12:52:21 +0000 (+0000)
Subject: <rdar://problem/17837631> OS X continues sending print data after the print job is... 
X-Git-Tag: v2.2b1~438
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6028693e0d17e0630635385819da97e35c516d9b;p=thirdparty%2Fcups.git

<rdar://problem/17837631> OS X continues sending print data after the print job is canceled at a printer

Stop sending data when we see an 'aborted-by-system' or 'job-canceled-xxx' value
in job-state-reasons.


git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@12260 a1ca3aef-8c08-0410-bb20-df032aa958be
---

diff --git a/CHANGES.txt b/CHANGES.txt
index a24be423c1..bd75b680c6 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -5,3 +5,5 @@ CHANGES IN CUPS V2.1b1
 
 	- Improved speed of ppdMarkDefaults for complex/large PPDs
 	  (<rdar://problem/15146999>)
+	- The IPP backend now stops sending print data if the printer indicates
+	  the job has been aborted or canceled (<rdar://problem/17837631>)
diff --git a/backend/ipp.c b/backend/ipp.c
index dc1a18289f..8edfdcadca 100644
--- a/backend/ipp.c
+++ b/backend/ipp.c
@@ -2448,6 +2448,8 @@ monitor_printer(
             new_reasons |= _CUPS_JSR_JOB_PASSWORD_WAIT;
           else if (!strcmp(attr->values[i].string.text, "job-release-wait"))
             new_reasons |= _CUPS_JSR_JOB_RELEASE_WAIT;
+          else if (!strncmp(attr->values[i].string.text, "job-canceled-", 13) || !strcmp(attr->values[i].string.text, "aborted-by-system"))
+            job_canceled = 1;
         }
 
         if (new_reasons != monitor->job_reasons)