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 11501ae712caf48d4d6f09536f02a8fe36cfe973..d95f7f997f175b64f2ff9eca22ff8bdcc56bed8a 100644 (file)
--- 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 fb9700b110440f7a8dc7ac7f0e323df5bbda72c7..80f6d89ef2be77a9352178bbc8cead8d8b499a47 100644 (file)
--- 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;
       }
     }