Mailing List Archive: Interchange: cvs

interchange - jon modified lib/Vend/Server.pm

Index | Next | Previous | View Threaded

interchange-cvs at icdevgroup

Jan 22, 2009, 7:56 PM

Post #1 of 3 (591 views)
Permalink

interchange - jon modified lib/Vend/Server.pm

User: jon
Date: 2009-01-23 03:56:36 GMT
Modified: lib/Vend 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
2.98 interchange/lib/Vend/Server.pm

rev 2.98, prev_rev 2.97
Index: Server.pm
===================================================================
RCS file: /var/cvs/interchange/lib/Vend/Server.pm,v
retrieving revision 2.97
retrieving revision 2.98
diff -u -u -r2.97 -r2.98
--- Server.pm 15 Jan 2009 02:08:04 -0000 2.97
+++ Server.pm 23 Jan 2009 03:56:36 -0000 2.98
@@ -1,6 +1,6 @@
# Vend::Server - Listen for Interchange CGI requests as a background server
#
-# $Id: Server.pm,v 2.97 2009-01-15 02:08:04 jon Exp $
+# $Id: Server.pm,v 2.98 2009-01-23 03:56:36 jon Exp $
#
# Copyright (C) 2002-2009 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.97 $, 10);
+$VERSION = substr(q$Revision: 2.98 $, 10);

use Cwd;
use POSIX qw(setsid strftime);
@@ -543,7 +543,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;

_______________________________________________
interchange-cvs mailing list
interchange-cvs [at] icdevgroup
http://www.icdevgroup.org/mailman/listinfo/interchange-cvs

interchange-cvs at icdevgroup

Jan 23, 2009, 6:51 AM

Post #2 of 3 (542 views)
Permalink

interchange - jon modified lib/Vend/Server.pm [In reply to]

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;

_______________________________________________
interchange-cvs mailing list
interchange-cvs [at] icdevgroup
http://www.icdevgroup.org/mailman/listinfo/interchange-cvs

interchange-cvs at icdevgroup

Jan 26, 2009, 11:14 PM

Post #3 of 3 (515 views)
Permalink

interchange - jon modified lib/Vend/Server.pm [In reply to]

User: jon
Date: 2009-01-27 07:14:08 GMT
Modified: lib/Vend Server.pm
Log:
Remove nonexistent @jobs variable from debug message.

Revision Changes Path
2.99 interchange/lib/Vend/Server.pm

rev 2.99, prev_rev 2.98
Index: Server.pm
===================================================================
RCS file: /var/cvs/interchange/lib/Vend/Server.pm,v
retrieving revision 2.98
retrieving revision 2.99
diff -u -u -r2.98 -r2.99
--- Server.pm 23 Jan 2009 03:56:36 -0000 2.98
+++ Server.pm 27 Jan 2009 07:14:08 -0000 2.99
@@ -1,6 +1,6 @@
# Vend::Server - Listen for Interchange CGI requests as a background server
#
-# $Id: Server.pm,v 2.98 2009-01-23 03:56:36 jon Exp $
+# $Id: Server.pm,v 2.99 2009-01-27 07:14:08 jon Exp $
#
# Copyright (C) 2002-2009 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.98 $, 10);
+$VERSION = substr(q$Revision: 2.99 $, 10);

use Cwd;
use POSIX qw(setsid strftime);
@@ -1396,14 +1396,14 @@
my ($cat, $delay, $jobname, @params) = grep /\S/, split /[\s,\0]+/, $value;
if ($delay && $delay < time()) {
# job expired
-#::logDebug ("Jobs @jobs expired ($delay vs $now)\n");
+#::logDebug ("Jobs expired ($delay vs $now)\n");
} elsif ($Job_servers++ >= $Global::Jobs->{MaxServers}) {
# no slot for job
$Job_servers--;
-#::logDebug ("Jobs @jobs queued, already %d jobs running/scheduled", $Job_servers);
+#::logDebug ("Jobs queued, already %d jobs running/scheduled", $Job_servers);
push(@queued_jobs, "$directive $value");
} else {
-#::logDebug ("Scheduled job @jobs for running");
+#::logDebug ("Scheduled job for running");
my %p;
for (@params) {
my ($name, $value) = split /\=/, $_, 2;

_______________________________________________
interchange-cvs mailing list
interchange-cvs [at] icdevgroup
http://www.icdevgroup.org/mailman/listinfo/interchange-cvs

Index | Next | Previous | View Threaded

Interested in having your list archived? Contact Gossamer Threads