diff options
author | mark <mark> | 2011-08-03 02:24:07 +0000 |
---|---|---|
committer | mark <mark> | 2011-08-03 02:24:07 +0000 |
commit | 4e181f0a24f8b514ea7bab6e0deef0cf3bbd73ab (patch) | |
tree | 8128b5d72b03f19a9096553bdb8b19c736c4cd55 | |
parent | 143ea0473ca61fa5e2d7eea4da3d6b63505cacec (diff) |
avoid corrupt attachments, #13209 and #13877
-rw-r--r-- | httemplate/view/attachment.html | 5 | ||||
-rwxr-xr-x | rt/share/html/Ticket/Attachment/dhandler | 1 |
2 files changed, 3 insertions, 3 deletions
diff --git a/httemplate/view/attachment.html b/httemplate/view/attachment.html index 5fc053967..5827e3d20 100644 --- a/httemplate/view/attachment.html +++ b/httemplate/view/attachment.html @@ -1,4 +1,3 @@ -<% $attach->body %> <%init> my ($query) = $cgi->keywords; $query =~ /^(\d+)$/; @@ -8,9 +7,9 @@ $FS::CurrentUser::CurrentUser->access_right('Download attachment') or die 'acces my $attach = qsearchs('cust_attachment', { attachnum => $attachnum }) or die "Attachment not found: $attachnum"; die 'access denied' if $attach->disabled; +$r->subprocess_env('no-gzip' => 1); # disable mod_deflate $m->clear_buffer; $r->content_type($attach->mime_type || 'text/plain'); $r->headers_out->add('Content-Disposition' => 'attachment;filename=' . $attach->filename); - - +$m->print($attach->body); </%init> diff --git a/rt/share/html/Ticket/Attachment/dhandler b/rt/share/html/Ticket/Attachment/dhandler index 8b41329ba..7330e3cf6 100755 --- a/rt/share/html/Ticket/Attachment/dhandler +++ b/rt/share/html/Ticket/Attachment/dhandler @@ -86,6 +86,7 @@ # $content_type = 'application/octet-stream'; # } + $r->subprocess_env('no-gzip' => 1); # disable mod_deflate $r->content_type( $content_type ); $m->clear_buffer(); $m->out($AttachmentObj->OriginalContent); |