summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Waugh <twaugh@redhat.com>2016-08-09 18:11:07 +0200
committerDidier Raboud <odyx@debian.org>2019-09-02 09:14:43 +0200
commit24dcd271201b557989053c739a604aaa8c7cd08e (patch)
treeb23af074e1ffcbd52b993a9109446ada99080ee0
parentf93b70c7756e851d9ef7529117c2703173cd0c8f (diff)
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 Gbp-Pq: Name fixes-for-jobs-with-multiple-files-and-multiple-formats.patch
-rw-r--r--backend/ipp.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/backend/ipp.c b/backend/ipp.c
index 8226acc7b..5902dd6cb 100644
--- a/backend/ipp.c
+++ b/backend/ipp.c
@@ -1803,7 +1803,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);