gitweb: update INSTALL to use shorter make target

[Gitweb] / gitweb.perl

diff --git a/gitweb.perl b/gitweb.perl
index 384a68ebe1ac784b7bb276982b53258b74cb85dc39c4af72bddaded7ad2f739d..d2bb028a66e95965b0304cd801b0bf6cc2432a0550233c2ad5e5cc5c8f4f11f5 100755 (executable)
--- a/gitweb.perl
+++ b/gitweb.perl
@@ -455,7 +455,11 @@ sub gitweb_get_feature {
                $feature{$name}{'sub'},
                $feature{$name}{'override'},
                @{$feature{$name}{'default'}});
                $feature{$name}{'sub'},
                $feature{$name}{'override'},
                @{$feature{$name}{'default'}});

-       if (!$override) { return @defaults; }
+       # project specific override is possible only if we have project
+       our $git_dir; # global variable, declared later
+       if (!$override || !defined $git_dir) {
+               return @defaults;
+       }

        if (!defined $sub) {
                warn "feature $name is not overridable";
                return @defaults;
        if (!defined $sub) {
                warn "feature $name is not overridable";
                return @defaults;


@@ -1147,6 +1151,7 @@ sub validate_refname {
 # in utf-8 thanks to "binmode STDOUT, ':utf8'" at beginning
 sub to_utf8 {
        my $str = shift;
 # in utf-8 thanks to "binmode STDOUT, ':utf8'" at beginning
 sub to_utf8 {
        my $str = shift;

+       return undef unless defined $str;

        if (utf8::valid($str)) {
                utf8::decode($str);
                return $str;
        if (utf8::valid($str)) {
                utf8::decode($str);
                return $str;


@@ -1159,6 +1164,7 @@ sub to_utf8 {
 # correct, but quoted slashes look too horrible in bookmarks
 sub esc_param {
        my $str = shift;
 # correct, but quoted slashes look too horrible in bookmarks
 sub esc_param {
        my $str = shift;

+       return undef unless defined $str;

        $str =~ s/([^A-Za-z0-9\-_.~()\/:@ ]+)/CGI::escape($1)/eg;
        $str =~ s/ /\+/g;
        return $str;
        $str =~ s/([^A-Za-z0-9\-_.~()\/:@ ]+)/CGI::escape($1)/eg;
        $str =~ s/ /\+/g;
        return $str;


@@ -1167,6 +1173,7 @@ sub esc_param {
 # quote unsafe chars in whole URL, so some charactrs cannot be quoted
 sub esc_url {
        my $str = shift;
 # quote unsafe chars in whole URL, so some charactrs cannot be quoted
 sub esc_url {
        my $str = shift;

+       return undef unless defined $str;

        $str =~ s/([^A-Za-z0-9\-_.~();\/;?:@&=])/sprintf("%%%02X", ord($1))/eg;
        $str =~ s/\+/%2B/g;
        $str =~ s/ /\+/g;
        $str =~ s/([^A-Za-z0-9\-_.~();\/;?:@&=])/sprintf("%%%02X", ord($1))/eg;
        $str =~ s/\+/%2B/g;
        $str =~ s/ /\+/g;


@@ -1178,6 +1185,8 @@ sub esc_html {
        my $str = shift;
        my %opts = @_;
 
        my $str = shift;
        my %opts = @_;
 

+       return undef unless defined $str;
+

        $str = to_utf8($str);
        $str = $cgi->escapeHTML($str);
        if ($opts{'-nbsp'}) {
        $str = to_utf8($str);
        $str = $cgi->escapeHTML($str);
        if ($opts{'-nbsp'}) {


@@ -1192,6 +1201,8 @@ sub esc_path {
        my $str = shift;
        my %opts = @_;
 
        my $str = shift;
        my %opts = @_;
 

+       return undef unless defined $str;
+

        $str = to_utf8($str);
        $str = $cgi->escapeHTML($str);
        if ($opts{'-nbsp'}) {
        $str = to_utf8($str);
        $str = $cgi->escapeHTML($str);
        if ($opts{'-nbsp'}) {


@@ -2206,6 +2217,8 @@ sub config_to_multi {
 sub git_get_project_config {
        my ($key, $type) = @_;
 
 sub git_get_project_config {
        my ($key, $type) = @_;
 

+       return unless defined $git_dir;
+

        # key sanity check
        return unless ($key);
        $key =~ s/^gitweb\.//;
        # key sanity check
        return unless ($key);
        $key =~ s/^gitweb\.//;


@@ -3376,7 +3389,7 @@ sub git_footer_html {
              "</html>";
 }
 
              "</html>";
 }
 

-# die_error(<http_status_code>, <error_message>)
+# die_error(<http_status_code>, <error_message>[, <detailed_html_description>])

 # Example: die_error(404, 'Hash not found')
 # By convention, use the following status codes (as defined in RFC 2616):
 # 400: Invalid or missing CGI parameters, or
 # Example: die_error(404, 'Hash not found')
 # By convention, use the following status codes (as defined in RFC 2616):
 # 400: Invalid or missing CGI parameters, or


@@ -3391,7 +3404,7 @@ sub git_footer_html {
 #      or down for maintenance).  Generally, this is a temporary state.
 sub die_error {
        my $status = shift || 500;
 #      or down for maintenance).  Generally, this is a temporary state.
 sub die_error {
        my $status = shift || 500;

-       my $error = shift || "Internal server error";
+       my $error = esc_html(shift) || "Internal Server Error";

        my $extra = shift;
 
        my %http_responses = (
        my $extra = shift;
 
        my %http_responses = (