From 54f63cdfb5a630111b1feaa178f7d9f75dfa425d Mon Sep 17 00:00:00 2001 From: msweet Date: Wed, 17 Jul 2013 02:54:31 +0000 Subject: [PATCH] The scheduler incorrectly did not pass a FINAL_CONTENT_TYPE environment variable to the filters or backend () git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@11147 a1ca3aef-8c08-0410-bb20-df032aa958be --- CHANGES.txt | 3 +++ scheduler/job.c | 3 +++ 2 files changed, 6 insertions(+) diff --git a/CHANGES.txt b/CHANGES.txt index 342483b98..ee7fb3195 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -3,6 +3,9 @@ CHANGES.txt - 1.7.0 - 2013-07-16 CHANGES IN CUPS V1.7.0 + - The scheduler incorrectly did not pass a FINAL_CONTENT_TYPE + environment variable to the filters or backend + () - The cups-exec helper program could fail randomly on OS X due to sandbox violations when closing excess file descriptors () diff --git a/scheduler/job.c b/scheduler/job.c index 3e17ba9e2..d62fb2f40 100644 --- a/scheduler/job.c +++ b/scheduler/job.c @@ -671,6 +671,9 @@ cupsdContinueJob(cupsd_job_t *job) /* I - Job */ "FINAL_CONTENT_TYPE=%s/%s", filter->dst->super, filter->dst->type); } + else + snprintf(final_content_type, sizeof(final_content_type), + "FINAL_CONTENT_TYPE=printer/%s", job->printer->name); } /* -- 2.39.2