escape ' ' with '+' in url's

[Gitweb] / gitweb.cgi

diff --git a/gitweb.cgi b/gitweb.cgi
index 01ee4cb26b582c980e2b84848f5397e27eff359d30d33875a25c5f9d02a31dc0..08c834d28329ff3eb7bfee2c44e9a5e902ec56cdf155189412388a957a8958e7 100755 (executable)
--- a/gitweb.cgi
+++ b/gitweb.cgi
@@ -15,7 +15,7 @@ use CGI::Carp qw(fatalsToBrowser);
 use Fcntl ':mode';
 
 my $cgi = new CGI;
-my $version =          "248";
+my $version =          "249";
 my $my_url =           $cgi->url();
 my $my_uri =           $cgi->url(-absolute => 1);
 my $rss_link = "";
@@ -209,8 +209,8 @@ if (!defined $action || $action eq "summary") {
 
 sub esc {
        my $str = shift;
-       $str =~ s/ /%20/g;
        $str =~ s/\+/%2B/g;
+       $str =~ s/ /\+/g;
        return $str;
 }
 
@@ -2167,7 +2167,7 @@ sub git_search {
 
        if ($pickaxe_search) {
                $/ = "\n";
-               open my $fd, "-|", "$gitbin/git-rev-list $hash | $gitbin/git-diff-tree -r --stdin -S$searchtext";
+               open my $fd, "-|", "$gitbin/git-rev-list $hash | $gitbin/git-diff-tree -r --stdin -S\'$searchtext\'";
                undef %co;
                my @files;
                while (my $line = <$fd>) {