===================================================================
RCS file: /cvs/cvsweb/cvsweb.cgi,v
retrieving revision 4.3
retrieving revision 4.7
diff -u -p -r4.3 -r4.7
--- cvsweb/cvsweb.cgi	2019/11/09 09:11:55	4.3
+++ cvsweb/cvsweb.cgi	2019/11/09 09:32:22	4.7
@@ -1,5 +1,5 @@
-#!/usr/bin/perl -T
-# $Id: cvsweb.cgi,v 4.3 2019/11/09 09:11:55 schwarze Exp $
+#!/usr/bin/perl
+# $Id: cvsweb.cgi,v 4.7 2019/11/09 09:32:22 schwarze Exp $
 # $knu: cvsweb.cgi,v 1.299 2010/11/13 16:37:18 simon
 #
 # cvsweb - a CGI interface to CVS trees.
@@ -50,7 +50,6 @@
 require 5.006;
 
 use strict;
-
 use warnings;
 use filetest qw(access);
 
@@ -88,7 +87,6 @@ use vars qw (
 );
 
 use Cwd                   qw(abs_path);
-use File::Basename        qw(dirname);
 use File::Path            qw(rmtree);
 use File::Spec::Functions qw(canonpath catdir catfile curdir devnull rootdir
                              tmpdir updir);
@@ -204,23 +202,9 @@ sub checkout_to_temp($$$);
 # (think mod_perl)...
 delete(@ENV{qw(PATH IFS CDPATH ENV BASH_ENV)});
 
-my ($mydir) = (dirname($0) =~ /(.*)/);    # untaint
+# Location of the configuration file inside the web server chroot:
+$config = '/conf/cvsweb/cvsweb.conf';
 
-##### Start of Configuration Area ########
-
-# == EDIT this ==
-# Locations to search for user configuration, in order:
-for (catfile($mydir, 'cvsweb.conf'), '/usr/local/etc/cvsweb/cvsweb.conf') {
-  if (-r $_) {
-    $config = $_;
-    last;
-  }
-}
-
-##### End of Configuration Area   ########
-
-undef $mydir;
-
 ######## Configuration parameters #########
 
 @CVSrepositories = @CVSROOT = %CVSROOT = %MIRRORS = %DEFAULTVALUE = %ICONS =
@@ -1556,7 +1540,7 @@ sub htmlify($;$)
          }{
             my($text, $name, $section) = ($1, $2, defined($3) ? $3 : $4);
             ($name =~ /[A-Za-z]/ && $name !~ /\.(:|$)/)
-             ? &link($text, sprintf($mancgi, $section, uri_escape($name)))
+             ? &link($text, sprintf($mancgi, uri_escape($name), $section))
               : $text;
          }egx;
       } $_;
@@ -4210,6 +4194,7 @@ sub htmlquote($)
   # Special Characters; RFC 1866
   s/&/&/g;
   s/\"/"/g;
+  s/%22/"/g;
   s/</&lt;/g;
   s/>/&gt;/g;
   return $_;