From: Marius Gavrilescu <marius@ieval.ro>
Date: Sat, 7 Feb 2015 13:20:31 +0000 (+0200)
Subject: Merge branch 'master' into newmc
X-Git-Url: http://git.ieval.ro/?a=commitdiff_plain;h=8c0779ff087b26adc70c7ef98d61be1c9549b5e8;hp=2513e22859091ce991c3773c9692418a7f8d26f6;p=plack-app-gruntmaster.git

Merge branch 'master' into newmc
---

diff --git a/lib/Plack/App/Gruntmaster.pm b/lib/Plack/App/Gruntmaster.pm
index f091892..6bc1f79 100644
--- a/lib/Plack/App/Gruntmaster.pm
+++ b/lib/Plack/App/Gruntmaster.pm
@@ -114,8 +114,11 @@ sub dispatch_request{
 		sub (/src/:job) {
 			return NOT_FOUND if !job;
 			my $isowner = remote_user && remote_user->id eq job->rawowner;
-			forbid !$isowner && (job->private || job->problem->private || job->contest && job->contest->is_running);
-			my @headers = ('X-Forever' => 1, 'Cache-Control' => 'public, max-age=604800', 'Content-Type' => CONTENT_TYPES->{job->format});
+			my $private = job->private || job->problem->private || job->contest && job->contest->is_running;
+			forbid !$isowner && $private;
+			my $privacy = $private ? 'private' : 'public';
+			my @headers = ('X-Forever' => 1, 'Cache-Control' => "$privacy, max-age=604800", 'Content-Type' => CONTENT_TYPES->{job->format});
+			push @headers, (Vary => 'Authorization') if $private;
 			[200, \@headers, [job->source]]
 		},