From: mike <mike@7a7537e8-13f0-0310-91df-b6672ffda945>
Date: Tue, 19 Feb 2013 23:33:08 +0000 (+0000)
Subject: The cupsfilter command did not set the CHARSET environment variable for the
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b40e0ec63b743bfd52db696f97be56fca2b68a61;p=thirdparty%2Fcups.git

The cupsfilter command did not set the CHARSET environment variable for the
text filters (STR #4273)



git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@10866 7a7537e8-13f0-0310-91df-b6672ffda945
---

diff --git a/CHANGES-1.6.txt b/CHANGES-1.6.txt
index 2ed8f7293f..f32d4aa602 100644
--- a/CHANGES-1.6.txt
+++ b/CHANGES-1.6.txt
@@ -12,6 +12,8 @@ CHANGES IN CUPS V1.6.2
 	- Added a French localization (STR #4247)
 	- Added a Russian localization (STR #4228)
 	- Updated the Catalan localization (STR #4202)
+	- The cupsfilter command did not set the CHARSET environment variable
+	  for the text filters (STR #4273)
 	- The lp command did not show errors for unknown "--foo" (STR #4261)
 	- Bad IPP responses could crash ipptool (STR #4262)
 	- Updated USB quirk rules for Canon and Xerox printers (STR #4217,
diff --git a/scheduler/cupsfilter.c b/scheduler/cupsfilter.c
index bbd9507c3c..7851967b1d 100644
--- a/scheduler/cupsfilter.c
+++ b/scheduler/cupsfilter.c
@@ -3,7 +3,7 @@
  *
  *   Filtering program for CUPS.
  *
- *   Copyright 2007-2012 by Apple Inc.
+ *   Copyright 2007-2013 by Apple Inc.
  *   Copyright 1997-2006 by Easy Software Products, all rights reserved.
  *
  *   These coded instructions, statements, and computer programs are the
@@ -917,7 +917,7 @@ exec_filters(mime_type_t   *srctype,	/* I - Source type */
 {
   int		i;			/* Looping var */
   const char	*argv[8],		/* Command-line arguments */
-		*envp[15],		/* Environment variables */
+		*envp[16],		/* Environment variables */
 		*temp;			/* Temporary string */
   char		*optstr,		/* Filter options */
 		content_type[1024],	/* CONTENT_TYPE */
@@ -1040,7 +1040,8 @@ exec_filters(mime_type_t   *srctype,	/* I - Source type */
   envp[11] = printer_name;
   envp[12] = rip_max_cache;
   envp[13] = userenv;
-  envp[14] = NULL;
+  envp[14] = "CHARSET=utf-8";
+  envp[15] = NULL;
 
   for (i = 0; argv[i]; i ++)
     fprintf(stderr, "DEBUG: argv[%d]=\"%s\"\n", i, argv[i]);