[interchange-cvs] interchange - jon modified lib/Vend/Server.pm

[interchange-cvs at icdevgroup.org]

User:      jon
Date:      2009-01-23 14:51:53 GMT
Modified:  lib/Vend Tag: STABLE_5_6-branch Server.pm
Log:
Work around problem with Vend::CharSet from Safe, when using $Document->send().

I hope this is only a temporary kludge till a better solution can be found.

Revision  Changes    Path
No                   revision



No                   revision



2.91.2.2             interchange/lib/Vend/Server.pm


rev 2.91.2.2, prev_rev 2.91.2.1
Index: Server.pm
===================================================================
RCS file: /var/cvs/interchange/lib/Vend/Server.pm,v
retrieving revision 2.91.2.1
retrieving revision 2.91.2.2
diff -u -u -r2.91.2.1 -r2.91.2.2
--- Server.pm	17 Sep 2008 23:28:16 -0000	2.91.2.1
+++ Server.pm	23 Jan 2009 14:51:53 -0000	2.91.2.2
@@ -1,6 +1,6 @@
 # Vend::Server - Listen for Interchange CGI requests as a background server
 #
-# $Id: Server.pm,v 2.91.2.1 2008-09-17 23:28:16 jon Exp $
+# $Id: Server.pm,v 2.91.2.2 2009-01-23 14:51:53 jon Exp $
 #
 # Copyright (C) 2002-2008 Interchange Development Group
 # Copyright (C) 1996-2002 Red Hat, Inc.
@@ -26,7 +26,7 @@
 package Vend::Server;
 
 use vars qw($VERSION);
-$VERSION = substr(q$Revision: 2.91.2.1 $, 10);
+$VERSION = substr(q$Revision: 2.91.2.2 $, 10);
 
 use Cwd;
 use POSIX qw(setsid strftime);
@@ -539,7 +539,12 @@
 	# $body is now a reference
     my ($s, $body) = @_;
 #show_times("begin response send") if $Global::ShowTimes;
-	my $response_charset = Vend::CharSet->default_charset();
+
+	# Safe kludge: duplicate Vend::CharSet->default_charset method here
+	# so that $Document->send() will work from within Safe
+	#my $response_charset = Vend::CharSet->default_charset();
+	my $c = $Global::Selector{$CGI::script_name};
+	my $response_charset = $c->{Variable}{MV_HTTP_CHARSET} || $Global::Variable->{MV_HTTP_CHARSET};
 
 	my $status;
 	return if $Vend::Sent;