From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS24940 5.9.0.0/16 X-Spam-Status: No, score=-0.3 required=3.0 tests=AWL,BAYES_20,RCVD_IN_XBL, SPF_FAIL,SPF_HELO_FAIL,URIBL_BLOCKED shortcircuit=no autolearn=no autolearn_force=no version=3.4.0 Received: from 80x24.org (tor-relay.zwiebeltoralf.de [5.9.158.75]) by dcvr.yhbt.net (Postfix) with ESMTP id 676041FCB7 for ; Sun, 15 May 2016 23:52:20 +0000 (UTC) From: Eric Wong To: meta@public-inbox.org Subject: [PATCH] git-http-backend: set cache headers Date: Sun, 15 May 2016 23:52:18 +0000 Message-Id: <20160515235218.18150-1-e@80x24.org> List-Id: Mostly stolen from git upstream, these should prevent any caches such as varnish or squid from acting improperly. --- lib/PublicInbox/GitHTTPBackend.pm | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/lib/PublicInbox/GitHTTPBackend.pm b/lib/PublicInbox/GitHTTPBackend.pm index abb70df..b58cc30 100644 --- a/lib/PublicInbox/GitHTTPBackend.pm +++ b/lib/PublicInbox/GitHTTPBackend.pm @@ -9,6 +9,7 @@ use warnings; use Fcntl qw(:seek); use IO::File; use PublicInbox::Spawn qw(spawn); +use HTTP::Date qw(time2str); # TODO: make configurable, but keep in mind it's better to have # multiple -httpd worker processes which are already scaled to @@ -33,6 +34,10 @@ our $ANY = join('|', @binary, @text); my $BIN = join('|', @binary); my $TEXT = join('|', @text); +my @no_cache = ('Expires', 'Fri, 01 Jan 1980 00:00:00 GMT', + 'Pragma', 'no-cache', + 'Cache-Control', 'no-cache, max-age=0, must-revalidate'); + my $nextq; sub do_next () { my $q = $nextq; @@ -42,8 +47,9 @@ sub do_next () { } } -sub r { - [ $_[0] , [qw(Content-Type text/plain Content-Length 0) ], [] ] +sub r ($) { + my ($s) = @_; + [ $s, [qw(Content-Type text/plain Content-Length 0), @no_cache ], [] ] } sub serve { @@ -73,11 +79,15 @@ sub drop_client ($) { sub serve_dumb { my ($cgi, $git, $path) = @_; + my @h; my $type; if ($path =~ /\A(?:$BIN)\z/o) { $type = 'application/octet-stream'; + push @h, 'Expires', time2str(time + 31536000); + push @h, 'Cache-Control', 'public, max-age=31536000'; } elsif ($path =~ /\A(?:$TEXT)\z/o) { $type = 'text/plain'; + push @h, @no_cache; } else { return r(404); } @@ -125,7 +135,7 @@ sub serve_dumb { }; my $code = 200; - my @h = ('Content-Type', $type); + push @h, 'Content-Type', $type; my $range = $env->{HTTP_RANGE}; if (defined $range && $range =~ /\bbytes=(\d*)-(\d*)\z/) { ($code, $len) = prepare_range($cgi, $in, \@h, $1, $2, $size);