The IPP backend now treats the client-error-not-possible status code as a job

history issue, allowing IPP printing to Windows to work (STR #4047)

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

diff --git a/CHANGES-1.5.txt b/CHANGES-1.5.txt
index 8fe01df5d57be2e55d4f07dd25839464c6d7e6e9..1947368dd6da49aa4107020bd5a9ab97a02bca7e 100644 (file)
--- a/CHANGES-1.5.txt
+++ b/CHANGES-1.5.txt
@@ -3,6 +3,9 @@ CHANGES-1.5.txt
 
 CHANGES IN CUPS V1.5.4
 
+       - The IPP backend now treats the client-error-not-possible status code
+         as a job history issue, allowing IPP printing to Windows to work
+         (STR #4047)
        - The IPP backend incorrectly included the document-format and
          compression attributes in Create-Job requests (STR #4086)
        - The libusb-based USB backend did not work on non-Linux platforms

diff --git a/backend/ipp.c b/backend/ipp.c
index 70cab8a8fe5442d952999d3c53e5475021fd3bc9..40c844fcdcd077dcf2ff6a9e9c0482260812ffb6 100644 (file)
--- a/backend/ipp.c
+++ b/backend/ipp.c
@@ -1702,7 +1702,7 @@ main(int  argc,                           /* I - Number of command-line args */
       response   = cupsDoRequest(http, request, resource);
       ipp_status = cupsLastError();
 
-      if (ipp_status == IPP_NOT_FOUND)
+      if (ipp_status == IPP_NOT_FOUND || ipp_status == IPP_NOT_POSSIBLE)
       {
        /*
         * Job has gone away and/or the server has no job history...
@@ -1724,7 +1724,6 @@ 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)
        {
          ippDelete(response);