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 342483b981e475fea16f172f0317068087189bc8..ee7fb31950420591a1065005d88588de858e9b3c 100644 (file)
--- 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 3e17ba9e29ca988adefde980c278916e81973e48..d62fb2f407f146add938da5b896c75a79da230e6 100644 (file)
--- 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);
     }
 
    /*