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

interchange-core@icdevgroup.org interchange-core@icdevgroup.org
Thu Jan 23 22:38:00 2003


User:      jon
Date:      2003-01-24 03:37:07 GMT
Modified:  lib/Vend Tag: STABLE_4_8-branch Server.pm
Log:
Merge from trunk:

* Fix whitespace transform, tolerate leading whitespace on header lines.

Revision  Changes    Path
No                   revision



No                   revision



2.0.2.11  +3 -3      interchange/lib/Vend/Server.pm


rev 2.0.2.11, prev_rev 2.0.2.10
Index: Server.pm
===================================================================
RCS file: /var/cvs/interchange/lib/Vend/Server.pm,v
retrieving revision 2.0.2.10
retrieving revision 2.0.2.11
diff -u -u -r2.0.2.10 -r2.0.2.11
--- Server.pm	23 Jan 2003 19:18:07 -0000	2.0.2.10
+++ Server.pm	24 Jan 2003 03:37:06 -0000	2.0.2.11
@@ -1,6 +1,6 @@
 # Vend::Server - Listen for Interchange CGI requests as a background server
 #
-# $Id: Server.pm,v 2.0.2.10 2003/01/23 19:18:07 jon Exp $
+# $Id: Server.pm,v 2.0.2.11 2003/01/24 03:37:06 jon Exp $
 #
 # Copyright (C) 1996-2002 Red Hat, Inc. and
 # Interchange Development Group, http://www.icdevgroup.org/
@@ -26,7 +26,7 @@
 package Vend::Server;
 
 use vars qw($VERSION);
-$VERSION = substr(q$Revision: 2.0.2.10 $, 10);
+$VERSION = substr(q$Revision: 2.0.2.11 $, 10);
 
 use POSIX qw(setsid strftime);
 use Vend::Util;
@@ -401,7 +401,7 @@
 	$_ = shift;
 	s:^\s+::;
 	s:\s+$::;
-	s:\s*\n:\r\n:mg;
+	s:\s*\n\s*:\r\n:g;
 	return "$_\r\n";
 }