diff options
| author |  Mark Rada <marada@uwaterloo.ca> | 2009-08-25 00:59:48 -0400 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2009-08-25 16:33:06 -0700 |
| commit | 34b31a8d5f48283ec3039777b24706585b4f9d41 (patch) | |
| tree | 43bad3d433286b6f7b157cd1a3532db30144d177 | |
| parent | gitweb: add support for XZ compressed snapshots (diff) | |
| download | tgif-34b31a8d5f48283ec3039777b24706585b4f9d41.tar.xz | |
gitweb: improve snapshot error handling
The last check in the second block of checks in the &git_snapshot routine
is never executed because the second to last check is a superset of the
last check.
Switch the order of the last two checks. It has the advantage of giving
clients a more specific reason why they cannot get a snapshot format if
the format they have chosen is disabled.
Signed-off-by: Mark Rada <marada@uwaterloo.ca>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rwxr-xr-x | gitweb/gitweb.perl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl index 84659f5672..b453ed0452 100755 --- a/gitweb/gitweb.perl +++ b/gitweb/gitweb.perl @@ -5175,10 +5175,10 @@ sub git_snapshot { die_error(400, "Invalid snapshot format parameter"); } elsif (!exists($known_snapshot_formats{$format})) { die_error(400, "Unknown snapshot format"); - } elsif (!grep($_ eq $format, @snapshot_fmts)) { - die_error(403, "Unsupported snapshot format"); } elsif ($known_snapshot_formats{$format}{'disabled'}) { die_error(403, "Snapshot format not allowed"); + } elsif (!grep($_ eq $format, @snapshot_fmts)) { + die_error(403, "Unsupported snapshot format"); } if (!defined $hash) { |