From 487cf0489446ec5b0c1cb8140cfebc9892469a5e Mon Sep 17 00:00:00 2001 From: Arne Georg Gleditsch Date: Fri, 30 Nov 2007 23:03:49 +0100 Subject: Aliasing like this will give you http://somehost/lxr/lxr/tree/.., which is going to be confusing. --- apache2-site.conf-dist | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apache2-site.conf-dist b/apache2-site.conf-dist index 0087eb5..e3d5e66 100644 --- a/apache2-site.conf-dist +++ b/apache2-site.conf-dist @@ -1,4 +1,4 @@ -Alias /lxr/ "@@LXRROOT@@/cgi-bin/" +Alias / "@@LXRROOT@@/cgi-bin/" Options None AllowOverride All -- cgit v1.2.3 From 61a443bbfe09b5684d2326f7b31e4005ca9a0a11 Mon Sep 17 00:00:00 2001 From: Arne Georg Gleditsch Date: Fri, 30 Nov 2007 23:04:38 +0100 Subject: Clean up req_url, don't remove trailing script name. --- lib/LXRng/Context.pm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/LXRng/Context.pm b/lib/LXRng/Context.pm index 3bc7a92..93edc6f 100644 --- a/lib/LXRng/Context.pm +++ b/lib/LXRng/Context.pm @@ -11,8 +11,9 @@ sub new { if ($args{'query'}) { # CGI::Simple appears to confuse '' with undef for SCRIPT_NAME. # $$self{'req_url'} = $args{'query'}->url(); - $$self{'req_url'} = - $args{'query'}->url(-base => 1).'/'.$ENV{'SCRIPT_NAME'}; + $$self{'req_url'} = $args{'query'}->url(-base => 1); + $$self{'req_url'} =~ s,/*$,/,; + $ENV{'SCRIPT_NAME'} =~ m,^/?(.*), and $$self{'req_url'} .= $1; foreach my $p ($args{'query'}->param) { $$self{'params'}{$p} = [$args{'query'}->param($p)]; @@ -157,7 +158,6 @@ sub base_url { my $base = $self->config->{'base_url'}; unless ($base) { $base = $$self{'req_url'}; - $base =~ s/lxr$//; } $base =~ s,/+$,,; -- cgit v1.2.3