* cvsweb: make empty SCRIPT_NAME work as expected
@ 2019-11-12 9:26 schwarze
0 siblings, 0 replies; only message in thread
From: schwarze @ 2019-11-12 9:26 UTC (permalink / raw)
To: source
Log Message:
-----------
make empty SCRIPT_NAME work as expected
Tags:
----
FreeBSD-cvsweb-2_0-branch
Modified Files:
--------------
cvsweb:
cvsweb.cgi
Revision Data
-------------
Index: cvsweb.cgi
===================================================================
RCS file: /home/cvs/mandoc/cvsweb/cvsweb.cgi,v
retrieving revision 3.119.2.24
retrieving revision 3.119.2.25
diff -Lcvsweb.cgi -Lcvsweb.cgi -u -p -r3.119.2.24 -r3.119.2.25
--- cvsweb.cgi
+++ cvsweb.cgi
@@ -247,7 +247,7 @@ $doCheckout = ($where =~ m|^/$checkoutMa
$where =~ s|^/$checkoutMagic/|/|;
$where =~ s|^/||;
$scriptname = defined($ENV{SCRIPT_NAME}) ? $ENV{SCRIPT_NAME} : '';
-$scriptname =~ s|^/*|/|;
+$scriptname =~ s|^/+||;
# Let's workaround thttpd's stupidity..
if ($scriptname =~ m|/$|) {
@@ -255,6 +255,7 @@ if ($scriptname =~ m|/$|) {
my $re = quotemeta $pathinfo;
$scriptname =~ s/$re$//;
}
+$scriptname = "/$scriptname" if $scriptname;
$scriptwhere = $scriptname;
$scriptwhere .= '/' . urlencode($where);
--
To unsubscribe send an email to source+unsubscribe@mandoc.bsd.lv
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2019-11-12 9:26 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-11-12 9:26 cvsweb: make empty SCRIPT_NAME work as expected schwarze
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).