From: msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be>
Date: Wed, 17 Jul 2013 02:54:31 +0000 (+0000)
Subject: The scheduler incorrectly did not pass a FINAL_CONTENT_TYPE environment variable
X-Git-Tag: release-1.7.0~39
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=54f63cdfb5a630111b1feaa178f7d9f75dfa425d;p=thirdparty%2Fcups.git

The scheduler incorrectly did not pass a FINAL_CONTENT_TYPE environment variable
to the filters or backend (<rdar://problem/14355011>)



git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@11147 a1ca3aef-8c08-0410-bb20-df032aa958be
---

diff --git a/CHANGES.txt b/CHANGES.txt
index 342483b981..ee7fb31950 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
+	  (<rdar://problem/14355011>)
 	- The cups-exec helper program could fail randomly on OS X due to
 	  sandbox violations when closing excess file descriptors
 	  (<rdar://problem/14421943>)
diff --git a/scheduler/job.c b/scheduler/job.c
index 3e17ba9e29..d62fb2f407 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);
     }
 
    /*