===================================================================
RCS file: /cvs/cvsweb/cvsweb.cgi,v
retrieving revision 4.37
retrieving revision 4.38
diff -u -p -r4.37 -r4.38
--- cvsweb/cvsweb.cgi	2019/11/29 18:50:15	4.37
+++ cvsweb/cvsweb.cgi	2019/11/29 19:30:16	4.38
@@ -1,5 +1,5 @@
 #!/usr/bin/perl
-# $Id: cvsweb.cgi,v 4.37 2019/11/29 18:50:15 schwarze Exp $
+# $Id: cvsweb.cgi,v 4.38 2019/11/29 19:30:16 schwarze Exp $
 # $knu: cvsweb.cgi,v 1.299 2010/11/13 16:37:18 simon
 #
 # cvsweb - a CGI interface to CVS trees.
@@ -66,7 +66,7 @@ use vars qw (
   $is_links $is_lynx $is_w3m $is_msie $is_mozilla3 $is_textbased
   %input $query $barequery $sortby $bydate $byrev $byauthor
   $bylog $byfile $defaultDiffType $logsort $cvstree $cvsroot
-  $charset $output_filter %CMD $allow_compress $backicon $diricon $fileicon
+  %CMD $allow_compress $backicon $diricon $fileicon
   $fullname $logo $defaulttitle $address $binfileicon $iconsdir
   $shortLogLen $show_author $hr_breakable $hr_ignwhite $hr_ignkeysubst
   $mime_types $allow_annotate $allow_markup $allow_mailtos
@@ -149,7 +149,6 @@ sub search_path($);
 sub getMimeType($;$);
 sub head($;$);
 sub scan_directives(@);
-sub openOutputFilter();
 sub doAnnotate($$);
 sub doCheckout($$$);
 sub cvswebMarkup($$$$$$;$);
@@ -1630,18 +1629,6 @@ sub scan_directives(@)
 }
 
 
-sub openOutputFilter()
-{
-  return unless $output_filter;
-
-  open(STDOUT, "|-") and return;
-
-  # child of child
-  open(STDERR, '>', devnull()) unless $DEBUG;
-  exec($output_filter) or exit -1;
-}
-
-
 ###############################
 # show Annotation
 ###############################
@@ -2081,7 +2068,6 @@ sub doDiff($$$$$$)
   my $fh = do { local (*FH); };
   if (!open($fh, "-|")) {    # child
     open(STDERR, ">&STDOUT");    # Redirect stderr to stdout
-    openOutputFilter();
     exec($CMD{rcsdiff}, @rcsdiff_options, @difftype, "-r$rev1", "-r$rev2",
          $fullname) or exit -1;
   }
@@ -2188,7 +2174,6 @@ sub getDirLogs($$@)
   my $fh = do { local (*FH); };
   if (!open($fh, '-|')) {                       # Child
     open(STDERR, '>', devnull()) unless $DEBUG; # Ignore rlog's complaints.
-    openOutputFilter();
     if ($file_list_len && $file_list_len > 1) {
       while (scalar(@files) > $file_list_len) {  # Process files in chunks.
         system(@cmd, splice(@files, 0, $file_list_len)) == 0 or exit -1;
@@ -2366,7 +2351,6 @@ sub readLog($;$)
 
   my $fh = do { local (*FH); };
   if (!open($fh, "-|")) {    # child
-    openOutputFilter();
     $revision = defined($revision) ? "-r$revision" : '';
     if ($revision =~ /\./) {
       # Normal revision, not a branch/tag name.
@@ -3579,9 +3563,7 @@ sub http_header(;$$)
 {
   my ($content_type, $moddate) = @_;
   $content_type ||= 'text/html';
-
-  $content_type .= "; charset=$charset"
-    if ($charset && $content_type =~ m,^text/,);
+  $content_type .= '; charset="UTF-8"' if $content_type =~ /^text\//;
 
   # Note that in the following, we explicitly join() and concatenate the
   # headers instead of printing them as an array.  This is because some