The IPP backend incorrectly included the document-format and compression

attributes in Create-Job requests (STR #4086)

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

diff --git a/CHANGES-1.5.txt b/CHANGES-1.5.txt
index 829ae2119af7c42d3d1597c996f9c2e674c8404f..8fe01df5d57be2e55d4f07dd25839464c6d7e6e9 100644 (file)
--- a/CHANGES-1.5.txt
+++ b/CHANGES-1.5.txt
@@ -3,6 +3,8 @@ CHANGES-1.5.txt
 
 CHANGES IN CUPS V1.5.4
 
+       - 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
          (STR #4088)
 

diff --git a/backend/ipp.c b/backend/ipp.c
index 708d0eb2cd5583eccf822277442565d95450c125..70cab8a8fe5442d952999d3c53e5475021fd3bc9 100644 (file)
--- a/backend/ipp.c
+++ b/backend/ipp.c
@@ -2322,7 +2322,7 @@ new_request(
     fprintf(stderr, "DEBUG: job-name=\"%s\"\n", title);
   }
 
-  if (format)
+  if (format && op != IPP_CREATE_JOB)
   {
     ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_MIMETYPE,
                 "document-format", NULL, format);
@@ -2330,7 +2330,7 @@ new_request(
   }
 
 #ifdef HAVE_LIBZ
-  if (compression)
+  if (compression && op != IPP_CREATE_JOB)
   {
     ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_KEYWORD,
                 "compression", NULL, compression);