Merge branch 'mm/maint-gitweb-project-maxdepth'

[git.git] / gitweb / gitweb.perl
diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl

index f80f2594cb2e498fa788d38f5b06c88e2fef95ca..285fe88403a9d65aafd9a9cf7628a4dde0aa9829 100755 (executable)
--- a/gitweb/gitweb.perl
+++ b/gitweb/gitweb.perl
@@ -1443,8 +1443,8 @@ sub validate_refname {
  sub to_utf8 {
         my $str = shift;
         return undef unless defined $str;
-       if (utf8::valid($str)) {
-               utf8::decode($str);
+
+       if (utf8::is_utf8($str) || utf8::decode($str)) {
                 return $str;
         } else {
                 return decode($fallback_encoding, $str, Encode::FB_DEFAULT);
@@ -1696,6 +1696,7 @@ sub chop_and_escape_str {
         my ($str) = @_;
  
         my $chopped = chop_str(@_);
+       $str = to_utf8($str);
         if ($chopped eq $str) {
                 return esc_html($chopped);
         } else {
@@ -2835,8 +2836,8 @@ sub git_get_projects_list {
                 my $dir = $projects_list;
                 # remove the trailing "/"
                 $dir =~ s!/+$!!;
-               my $pfxlen = length("$projects_list");
-               my $pfxdepth = ($projects_list =~ tr!/!!);
+               my $pfxlen = length("$dir");
+               my $pfxdepth = ($dir =~ tr!/!!);
                 # when filtering, search only given subdirectory
                 if ($filter) {
                         $dir .= "/$filter";
@@ -6243,7 +6244,9 @@ sub git_blame_common {
                         -type=>"text/plain", -charset => "utf-8",
                         -status=> "200 OK");
                 local $| = 1; # output autoflush
-               print while <$fd>;
+               while (my $line = <$fd>) {
+                       print to_utf8($line);
+               }
                 close $fd
                         or print "ERROR $!\n";
  
@@ -7862,11 +7865,12 @@ sub git_opml {
                 -charset => 'utf-8',
                 -content_disposition => 'inline; filename="opml.xml"');
  
+       my $title = esc_html($site_name);
         print <<XML;
  <?xml version="1.0" encoding="utf-8"?>
  <opml version="1.0">
  <head>
-  <title>$site_name OPML Export</title>
+  <title>$title OPML Export</title>
  </head>
  <body>
  <outline text="git RSS feeds">