From: msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be>
Date: Sun, 22 Dec 2013 05:18:05 +0000 (+0000)
Subject: Mirror fix from trunk.
X-Git-Tag: release-2.1.4~16^2~70
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d67e4b67b29922fdecd8b368847bb61d905434b0;p=thirdparty%2Fcups.git

Mirror fix from trunk.


git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/branches/branch-1.7@11491 a1ca3aef-8c08-0410-bb20-df032aa958be
---

diff --git a/CHANGES.txt b/CHANGES.txt
index 11501ae712..d95f7f997f 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -28,6 +28,8 @@ CHANGES IN CUPS V1.7.1
 	  (<rdar://problem/15564888>)
 	- Shared printers could become inaccessible after a few days on OS X
 	  (<rdar://problem/15426838>)
+	- The IPP backend did not wait for a busy printer to become available
+	  before attempting to print (<rdar://problem/15465667>)
 
 
 CHANGES IN CUPS V1.7.0
diff --git a/backend/ipp.c b/backend/ipp.c
index fb9700b110..80f6d89ef2 100644
--- a/backend/ipp.c
+++ b/backend/ipp.c
@@ -1024,7 +1024,8 @@ main(int  argc,				/* I - Number of command-line args */
 	delay = _cupsNextDelay(delay, &prev_delay);
 
 	ippDelete(supported);
-	supported = NULL;
+	supported  = NULL;
+	ipp_status = IPP_STATUS_ERROR_BUSY;
 	continue;
       }
     }