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 734fc463
	for <source@mandoc.bsd.lv>;
	Tue, 12 Nov 2019 04:28:45 -0500 (EST)
Date: Tue, 12 Nov 2019 04:28:45 -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: merge rev.
X-Mailer: activitymail 1.26, http://search.cpan.org/dist/activitymail/
Content-Type: text/plain; charset=utf-8
Message-ID: <8d0778965e045036@mandoc.bsd.lv>

Log Message:
-----------
merge rev. 3.119.2.25:
make empty SCRIPT_NAME work as expected

Modified Files:
--------------
    cvsweb:
        cvsweb.cgi

Revision Data
-------------
Index: cvsweb.cgi
===================================================================
RCS file: /home/cvs/mandoc/cvsweb/cvsweb.cgi,v
retrieving revision 4.20
retrieving revision 4.21
diff -Lcvsweb.cgi -Lcvsweb.cgi -u -p -r4.20 -r4.21
--- cvsweb.cgi
+++ cvsweb.cgi
@@ -263,7 +263,7 @@ $scriptname    = '' unless defined($scri
 $where         =  $pathinfo;
 $doCheckout    =  $where =~ s|^/$CheckoutMagic/|/|o;
 $where         =~ s|^/||;
-$scriptname    =~ s|^/*|/|;
+$scriptname    =~ s|^/+||;
 
 # Let's workaround thttpd's stupidity..
 if ($scriptname =~ m|/$|) {
@@ -271,6 +271,7 @@ if ($scriptname =~ m|/$|) {
   my $re = quotemeta $pathinfo;
   $scriptname =~ s/$re$//;
 }
+$scriptname = "/$scriptname" if $scriptname;
 
 # $scriptname : the URI escaped path to this script
 # $where      : the path in the CVS repository (without leading /, or only /)
--
 To unsubscribe send an email to source+unsubscribe@mandoc.bsd.lv