X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FWwwText.pm;h=87dc0751fb6b13fb97611cc3314f836757ec7115;hb=aaf555cd455b46528f893ebb0f4769997fb94a74;hp=08691684d99ea5f9fad132ce10e0131f1fbbc752;hpb=9f9290893bc241c5363d03b2d3c4acd15deb6d71;p=public-inbox.git diff --git a/lib/PublicInbox/WwwText.pm b/lib/PublicInbox/WwwText.pm index 08691684..87dc0751 100644 --- a/lib/PublicInbox/WwwText.pm +++ b/lib/PublicInbox/WwwText.pm @@ -38,16 +38,13 @@ sub get_text { } my $env = $ctx->{env}; if ($raw) { - my $body; - if (my $gzf = $code == 200 ? gzf_maybe($hdr, $env) : undef) { - my $zbuf = $gzf->translate($txt); - undef $txt; - $body = [ $zbuf .= $gzf->translate(undef) ]; - } else { - $body = [ $txt ]; + if ($code == 200) { + my $gzf = gzf_maybe($hdr, $env); + $txt = $gzf->translate($txt); + $txt .= $gzf->zflush; } - $hdr->[3] = bytes::length($body->[0]); - return [ $code, $hdr, $body ] + $hdr->[3] = bytes::length($txt); + return [ $code, $hdr, [ $txt ] ] } # enforce trailing slash for "wget -r" compatibility @@ -184,7 +181,13 @@ EOF # and drop the original structure if (defined(my $cr = $ibx->{coderepo})) { $$txt .= "\tcoderepo = $_\n" for @$cr; + $$txt .= <<'EOF'; +; `coderepo' entries allows blob reconstruction via patch emails if +; the inbox is indexed with Xapian. `@@ @@' +; line number ranges in `[PATCH]' emails link to /$INBOX_NAME/$OID/s/, +; an HTTP endpoint which reconstructs git blobs via git-apply(1). +EOF my $pi_config = $ctx->{www}->{pi_config}; for my $cr_name (@$cr) { my $urls = $pi_config->{"coderepo.$cr_name.cgiturl"}; @@ -195,11 +198,11 @@ EOF if ($urls && scalar(@$urls)) { $$txt .= "\t; "; $$txt .= join(" ||\n\t;\t", map {; - my $cpath = $path; + my $dst = $path; if ($path !~ m![a-z0-9_/\.\-]!i) { - $cpath = dq_escape($cpath); + $dst = '"'.dq_escape($dst).'"'; } - qq(git clone $_ "$cpath"); + qq(git clone $_ $dst); } @$urls); $$txt .= "\n"; }