From: Eric Wong <e@yhbt.net>
Date: Thu, 30 Jan 2020 09:19:06 +0000 (+0000)
Subject: mboxgz: ensure gzipped mboxes always have filenames
X-Git-Tag: v1.3.0~38
X-Git-Url: http://www.git.stargrave.org/?a=commitdiff_plain;h=31cb75037a757c9388f74283a8b1ecb7c5b65f24;p=public-inbox.git

mboxgz: ensure gzipped mboxes always have filenames

Lets always have Content-Disposition for files intended
to be downloaded for consumption by non-browsers, such
as pigz, zcat, "git am".

This is also to be consistent with the non-gzipped mbox
$MESSAGE_ID/raw endpoint.
---

diff --git a/lib/PublicInbox/MboxGz.pm b/lib/PublicInbox/MboxGz.pm
index 08e3c846..30074e4d 100644
--- a/lib/PublicInbox/MboxGz.pm
+++ b/lib/PublicInbox/MboxGz.pm
@@ -21,12 +21,10 @@ sub response {
 	my ($class, $ctx, $cb, $fn) = @_;
 	my $body = $class->new($ctx, $cb);
 	# http://www.iana.org/assignments/media-types/application/gzip
-	my @h = qw(Content-Type application/gzip);
-	if (defined $fn && $fn ne '') {
-		$fn = to_filename($fn);
-		push @h, 'Content-Disposition', "inline; filename=$fn.mbox.gz";
-	}
-	[ 200, \@h, $body ];
+	$fn = defined($fn) && $fn ne '' ? to_filename($fn) : 'no-subject';
+	my $h = [ qw(Content-Type application/gzip),
+		'Content-Disposition', "inline; filename=$fn.mbox.gz" ];
+	[ 200, $h, $body ];
 }
 
 sub gzip_fail ($$) {
diff --git a/t/psgi_search.t b/t/psgi_search.t
index 56b42118..4ff25eb2 100644
--- a/t/psgi_search.t
+++ b/t/psgi_search.t
@@ -107,6 +107,12 @@ test_psgi(sub { $www->call(@_) }, sub {
 		'subject-less message linked from "/$INBOX/?q=..."');
 	like($html, qr/\bhref="blank-subject[^>]+>\(no subject\)</,
 		'blank subject message linked from "/$INBOX/?q=..."');
+	$res = $cb->(GET('/test/no-subject-at-all@example.com/raw'));
+	like($res->header('Content-Disposition'),
+		qr/filename=no-subject\.txt/);
+	$res = $cb->(GET('/test/no-subject-at-all@example.com/t.mbox.gz'));
+	like($res->header('Content-Disposition'),
+		qr/filename=no-subject\.mbox\.gz/);
 });
 
 done_testing();