[Lxr-commits] CVS: lxr/lib/LXR Config.pm,1.28,1.29

[Dave B. <bro...@us...>]

Update of /cvsroot/lxr/lxr/lib/LXR
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17931/lib/LXR

Modified Files:
	Config.pm 
Log Message:
fix bug where substring match of url happens too early and wrong config is used

Index: Config.pm
===================================================================
RCS file: /cvsroot/lxr/lxr/lib/LXR/Config.pm,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- Config.pm	15 Jul 2004 14:41:04 -0000	1.28
+++ Config.pm	15 Jul 2004 14:55:00 -0000	1.29
@@ -61,8 +61,6 @@
     unless ($url) {
 		$url = 'http://'.$ENV{'SERVER_NAME'}.':'.$ENV{'SERVER_PORT'};
 		$url =~ s/:80$//;
-
-		$url .= $ENV{'SCRIPT_NAME'};
     }
     
     $url =~ s|^http://([^/]*):443/|https://$1/|;
@@ -98,6 +96,7 @@
 			my $root = $config->{baseurl};
 			push @aliases, $root;
 			foreach my $rt (@aliases) {
+				$rt .= '/' unless $rt =~ m#/$#; # append / if necessary
 				my $r = quotemeta($rt);
 				if ($url =~ /^$r/) {
 					$config->{baseurl} = $rt;