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

[interchange-cvs at icdevgroup.org]

User:      heins
Date:      2004-04-30 19:23:07 GMT
Modified:  lib/Vend Server.pm
Log:
* Fix X-Track headers so that they will always be canonical.

Revision  Changes    Path
2.51      +5 -3      interchange/lib/Vend/Server.pm


rev 2.51, prev_rev 2.50
Index: Server.pm
===================================================================
RCS file: /var/cvs/interchange/lib/Vend/Server.pm,v
retrieving revision 2.50
retrieving revision 2.51
diff -u -r2.50 -r2.51
--- Server.pm	7 Mar 2004 06:59:50 -0000	2.50
+++ Server.pm	30 Apr 2004 19:23:07 -0000	2.51
@@ -1,6 +1,6 @@
 # Vend::Server - Listen for Interchange CGI requests as a background server
 #
-# $Id: Server.pm,v 2.50 2004/03/07 06:59:50 mheins Exp $
+# $Id: Server.pm,v 2.51 2004/04/30 19:23:07 mheins Exp $
 #
 # Copyright (C) 2002-2003 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.50 $, 10);
+$VERSION = substr(q$Revision: 2.51 $, 10);
 
 use POSIX qw(setsid strftime);
 use Vend::Util;
@@ -500,6 +500,8 @@
 	$$body =~ s/^\s+//
 		if ! $Vend::ResponseMade and $::Pragma->{strip_white};
 
+	$Vend::StatusLine =~ s/\s*$/\r\n/ if $Vend::StatusLine;
+
 	if(! $s and $Vend::StatusLine) {
 		$Vend::StatusLine .= ($Vend::StatusLine =~ /^Content-Type:/im)
 							? '' : "\r\nContent-Type: text/html\r\n";
@@ -554,7 +556,7 @@
 		my $save = select $fh;
 		$| = 1;
 		select $save;
-        $Vend::StatusLine .= "X-Track: " . $Vend::Track->header() . "\r\n"
+        $Vend::StatusLine .= "\r\nX-Track: " . $Vend::Track->header() . "\r\n"
 			if $Vend::Track;
 # END TRACK                            
         $Vend::StatusLine .= "Pragma: no-cache\r\n"