From owner-freebsd-cvsweb@FreeBSD.ORG  Sat Apr  1 21:32:16 2006
Return-Path: <owner-freebsd-cvsweb@FreeBSD.ORG>
X-Original-To: freebsd-cvsweb@freebsd.org
Delivered-To: freebsd-cvsweb@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id C0BA516A423
	for <freebsd-cvsweb@freebsd.org>; Sat,  1 Apr 2006 21:32:16 +0000 (UTC)
	(envelope-from cmanley@xs4all.nl)
Received: from smtp-vbr4.xs4all.nl (smtp-vbr4.xs4all.nl [194.109.24.24])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 49B8643D49
	for <freebsd-cvsweb@freebsd.org>; Sat,  1 Apr 2006 21:31:56 +0000 (GMT)
	(envelope-from cmanley@xs4all.nl)
Received: from [127.0.0.1] (hfx.xs4all.nl [80.126.189.25])
	by smtp-vbr4.xs4all.nl (8.13.6/8.13.6) with ESMTP id k31LVsQw020164
	for <freebsd-cvsweb@freebsd.org>; Sat, 1 Apr 2006 23:31:55 +0200 (CEST)
	(envelope-from cmanley@xs4all.nl)
Message-ID: <442EF162.6090406@xs4all.nl>
Date: Sat, 01 Apr 2006 23:32:18 +0200
From: Craig Manley <cmanley@xs4all.nl>
User-Agent: Thunderbird 1.5 (Windows/20051201)
MIME-Version: 1.0
To: freebsd-cvsweb@freebsd.org
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit
X-Virus-Scanned: by XS4ALL Virus Scanner
Subject: Patch to make cvsweb.cgi work with relative icon and css paths
X-BeenThere: freebsd-cvsweb@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: CVS Web maintenance mailing list <freebsd-cvsweb.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-cvsweb>, 
	<mailto:freebsd-cvsweb-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-cvsweb>
List-Post: <mailto:freebsd-cvsweb@freebsd.org>
List-Help: <mailto:freebsd-cvsweb-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-cvsweb>,
	<mailto:freebsd-cvsweb-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 01 Apr 2006 21:32:16 -0000

To whom cares,

This is the patch I just made. It also contains a fix for making warns 
and die's work when run in ModPerl::PerlRun.

144a145,149
 >
 > $ENV{'MOD_PERL_API_VERSION'} && ($ENV{'MOD_PERL_API_VERSION'} >= 2) 
&& (local $SIG{__WARN__} = \&Apache2::ServerRec::warn);
 > $ENV{'MOD_PERL_API_VERSION'} && ($ENV{'MOD_PERL_API_VERSION'} >= 2) 
&& (local $SIG{__DIE__} = \&Apache2::ServerRec::die);
 >
 >
205a211
 > sub extractScriptUriPath();
373a380,386
 > # Prepend script's path uri to css url if css url is relative.
 > if ($cssurl) {
 >   unless($cssurl =~ m|^/|) {
 >     $cssurl = extractScriptUriPath() . "/$cssurl";
 >   }
 > }
 >
640a654,657
 >     # Prepend script's path uri to icon uri if icon uri is relative.
 >     unless($ipath =~ m|^/|) {
 >       $ipath = extractScriptUriPath() . "/$ipath";
 >     }
4426a4444,4455
 >
 >
 > #
 > # Extracts and returns the URI path of this script.
 > #
 > sub extractScriptUriPath() {
 >   my $s = $ENV{'SCRIPT_NAME'};
 >   $s =~ s|/[^/]+$||;
 >   return $s;
 > }
 >
 >