Don't add an extra document-format attribute (Issue #1457)

michaelrsweet · michaelrsweet · commit ef959be6b0ba · 2026-03-30T17:19:56.000-04:00
diff --git a/cups/encode.c b/cups/encode.c
@@ -1,7 +1,7 @@
 /*
  * Option encoding routines for CUPS.
  *
- * Copyright © 2020-2025 by OpenPrinting.
+ * Copyright © 2020-2026 by OpenPrinting.
  * Copyright © 2007-2019 by Apple Inc.
  * Copyright © 1997-2007 by Easy Software Products.
  *
@@ -769,7 +769,7 @@ cupsEncodeOptions2(
 
   op = ippGetOperation(ipp);
 
-  if (group_tag == IPP_TAG_OPERATION && (op == IPP_OP_PRINT_JOB || op == IPP_OP_PRINT_URI || op == IPP_OP_SEND_DOCUMENT || op == IPP_OP_SEND_URI))
+  if (group_tag == IPP_TAG_OPERATION && (op == IPP_OP_PRINT_JOB || op == IPP_OP_PRINT_URI || op == IPP_OP_SEND_DOCUMENT || op == IPP_OP_SEND_URI) && !ippFindAttribute(ipp, "document-format", IPP_TAG_ZERO))
   {
    /*
     * Handle the document format stuff first...

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`/*`
`2`	`2`	`* Option encoding routines for CUPS.`
`3`	`3`	`*`
`4`		`- * Copyright © 2020-2025 by OpenPrinting.`
	`4`	`+ * Copyright © 2020-2026 by OpenPrinting.`
`5`	`5`	`* Copyright © 2007-2019 by Apple Inc.`
`6`	`6`	`* Copyright © 1997-2007 by Easy Software Products.`
`7`	`7`	`*`
`@@ -769,7 +769,7 @@ cupsEncodeOptions2(`
`769`	`769`
`770`	`770`	`op = ippGetOperation(ipp);`
`771`	`771`
`772`		`- if (group_tag == IPP_TAG_OPERATION && (op == IPP_OP_PRINT_JOB \|\| op == IPP_OP_PRINT_URI \|\| op == IPP_OP_SEND_DOCUMENT \|\| op == IPP_OP_SEND_URI))`
	`772`	`+ if (group_tag == IPP_TAG_OPERATION && (op == IPP_OP_PRINT_JOB \|\| op == IPP_OP_PRINT_URI \|\| op == IPP_OP_SEND_DOCUMENT \|\| op == IPP_OP_SEND_URI) && !ippFindAttribute(ipp, "document-format", IPP_TAG_ZERO))`
`773`	`773`	`{`
`774`	`774`	`/*`
`775`	`775`	`* Handle the document format stuff first...`