diff options
| author | Arne Georg Gleditsch <argggh@lxr.linpro.no> | 2007-11-30 23:04:38 +0100 |
|---|---|---|
| committer | Arne Georg Gleditsch <argggh@lxr.linpro.no> | 2007-11-30 23:04:38 +0100 |
| commit | 61a443bbfe09b5684d2326f7b31e4005ca9a0a11 (patch) | |
| tree | 455ff70bf915bcc0002799e801ac77e159a09512 | |
| parent | 487cf0489446ec5b0c1cb8140cfebc9892469a5e (diff) | |
Clean up req_url, don't remove trailing script name.
| -rw-r--r-- | lib/LXRng/Context.pm | 6 |
1 files 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,/+$,,; |