From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from localhost (mandoc.bsd.lv [local])
	by mandoc.bsd.lv (OpenSMTPD) with ESMTPA id 46561a31
	for <source@mandoc.bsd.lv>;
	Tue, 12 Nov 2019 04:26:51 -0500 (EST)
Date: Tue, 12 Nov 2019 04:26:51 -0500 (EST)
X-Mailinglist: mandoc-source
Reply-To: source@mandoc.bsd.lv
MIME-Version: 1.0
From: schwarze@mandoc.bsd.lv
To: source@mandoc.bsd.lv
Subject: cvsweb: make empty SCRIPT_NAME work as expected
X-Mailer: activitymail 1.26, http://search.cpan.org/dist/activitymail/
Content-Type: text/plain; charset=utf-8
Message-ID: <8d07786e918bb6e2@mandoc.bsd.lv>

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