From: mike <mike@7a7537e8-13f0-0310-91df-b6672ffda945>
Date: Fri, 18 May 2012 20:17:41 +0000 (+0000)
Subject: The scheduler now sets the CUPS_MAX_MESSAGE environment variable for filters
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0cd8f4ee5abbee7e2990d0d9db2e09f9b962e7d6;p=thirdparty%2Fcups.git

The scheduler now sets the CUPS_MAX_MESSAGE environment variable for filters
(STR #4074)



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

diff --git a/CHANGES-1.5.txt b/CHANGES-1.5.txt
index d5cfb14ca1..e94eb20cae 100644
--- a/CHANGES-1.5.txt
+++ b/CHANGES-1.5.txt
@@ -3,6 +3,8 @@ CHANGES-1.5.txt
 
 CHANGES IN CUPS V1.5.4
 
+	- The scheduler now sets the CUPS_MAX_MESSAGE environment variable for
+	  filters (STR #4074)
 	- Fixed a build issue when using older versions of autoconf (STR #4084)
 	- The IPP backend now treats the client-error-not-possible status code
 	  as a job history issue, allowing IPP printing to Windows to work
diff --git a/man/filter.man b/man/filter.man
index 59fcd29719..a9805180a3 100644
--- a/man/filter.man
+++ b/man/filter.man
@@ -12,7 +12,7 @@
 .\"   which should have been included with this file.  If this file is
 .\"   file is missing or damaged, see the license at "http://www.cups.org/".
 .\"
-.TH filter 7 "CUPS" "13 April 2012" "Apple Inc."
+.TH filter 7 "CUPS" "18 May 2012" "Apple Inc."
 .SH NAME
 filter \- cups file conversion filter interface
 .SH SYNOPSIS
@@ -169,6 +169,11 @@ CUPS_FILETYPE
 The type of file being printed: "job-sheet" for a banner page and "document"
 for a regular print file.
 .TP 5
+CUPS_MAX_MESSAGE
+.br
+The maximum size of a message sent to stderr, including any leading prefix and
+the trailing newline.
+.TP 5
 CUPS_SERVERROOT
 .br
 The root directory of the server.
diff --git a/scheduler/env.c b/scheduler/env.c
index 19a942a070..b41fea1185 100644
--- a/scheduler/env.c
+++ b/scheduler/env.c
@@ -62,7 +62,7 @@ cupsdInitEnv(void)
 
 #if defined(__APPLE__)
  /*
-  * Add special voodoo magic for MacOS X - this allows MacOS X 
+  * Add special voodoo magic for MacOS X - this allows MacOS X
   * programs to access their bundle resources properly...
   *
   * This string is replaced in cupsdStartProcess()...
@@ -227,6 +227,8 @@ cupsdUpdateEnv(void)
   set_if_undefined("TZ", NULL);
   set_if_undefined("USER", "root");
   set_if_undefined("VG_ARGS", NULL);
+
+  cupsdSetEnvf("CUPS_MAX_MESSAGE", "%d", CUPSD_SB_BUFFER_SIZE - 1);
 }