summaryrefslogtreecommitdiff
path: root/debian/patches/fixes-for-jobs-with-multiple-files-and-multiple-formats.patch
blob: 6a34047776baf9d24d6bbb82b8b6000e9dd30d4a (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
From fd4f4b165190e31071061d2d9659448aff4efc23 Mon Sep 17 00:00:00 2001
From: Tim Waugh <twaugh@redhat.com>
Date: Tue, 9 Aug 2016 18:11:07 +0200
Subject: Fix jobs with multiple files or multiple formats

Bug-Redhat: https://bugzilla.redhat.com/show_bug.cgi?id=972242
Bug: https://www.cups.org/str.php?L4348
Last-Updated: 2015-02-10
Patch-Name: fixes-for-jobs-with-multiple-files-and-multiple-formats.patch
---
 backend/ipp.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/backend/ipp.c b/backend/ipp.c
index a338577f9..88c8ba8ee 100644
--- a/backend/ipp.c
+++ b/backend/ipp.c
@@ -1777,7 +1777,10 @@ main(int  argc,				/* I - Number of command-line args */
 	ippAddBoolean(request, IPP_TAG_OPERATION, "last-document",
         	      (i + 1) >= num_files);
 
-	if (document_format)
+	if (num_files > 1)
+	  ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_MIMETYPE,
+		       "document-format", NULL, "application/octet-stream");
+	else if (document_format)
 	  ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_MIMETYPE,
 		       "document-format", NULL, document_format);