[BACK]Return to cvsweb.cgi CVS log [TXT][DIR] Up to [cvsweb.bsd.lv] / cvsweb

Diff for /cvsweb/cvsweb.cgi between version 4.37 and 4.38

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

Legend:
Removed from v.4.37  
changed lines
  Added in v.4.38

CVSweb