diff options
Diffstat (limited to 'Bugzilla')
| -rw-r--r-- | Bugzilla/Attachment.pm | 44 | ||||
| -rw-r--r-- | Bugzilla/Config/Attachment.pm | 8 |
2 files changed, 2 insertions, 50 deletions
diff --git a/Bugzilla/Attachment.pm b/Bugzilla/Attachment.pm index e165b139e..b44c94cd0 100644 --- a/Bugzilla/Attachment.pm +++ b/Bugzilla/Attachment.pm @@ -308,8 +308,7 @@ sub is_viewable { =item C<data> -Returns the content of the attachment. -As a side-effect, sets $self->is_on_filesystem. +the content of the attachment =back @@ -326,16 +325,10 @@ sub data { undef, $self->id); - # Setting the property here is cheap, as opposed to making an extra - # query later, and hitting the filesystem to see if the file is - # still there. - $self->{is_on_filesystem} = 0; # If there's no attachment data in the database, the attachment is stored # in a local file, so retrieve it from there. if (length($self->{data}) == 0) { if (open(AH, $self->_get_local_filename())) { - # file is actually on disk. - $self->{is_on_filesystem} = 1; local $/; binmode AH; $self->{data} = <AH>; @@ -348,36 +341,9 @@ sub data { =over -=item C<is_on_filesystem> - -Returns true if the attachment is stored on disk (via maxlocalattachment -parameter), as opposed to in the database. - -=back - -=cut - -# When the attachment is on the filesystem, you can let the backend -# (nginx, apache, lighttpd) serve it for you if it supports the X-Sendfile -# feature. This means that the attachment CGI script may have a reduced -# footprint. e.g. bug 906010 and bug 1073241. - -sub is_on_filesystem { - my $self = shift; - return $self->{is_on_filesystem} if exists $self->{is_on_filesystem}; - # In order to serve an attachment, you also send the datasize in the - # content-length header. Making additional queries which are exactly - # the same as found in the datasize code path is just wasteful. - my $datasize = $self->datasize; - return $self->{is_on_filesystem}; -} - -=over - =item C<datasize> -Returns the length (in bytes) of the attachment content. -As a side-effect, sets $self->is_on_filesystem. +the length (in bytes) of the attachment content =back @@ -404,17 +370,11 @@ sub datasize { WHERE id = ?", undef, $self->id) || 0; - # Setting the property here is cheap, as opposed to making an extra - # query later, and hitting the filesystem to see if the file is - # still there. - $self->{is_on_filesystem} = 0; # If there's no attachment data in the database, either the attachment # is stored in a local file, and so retrieve its size from the file, # or the attachment has been deleted. unless ($self->{datasize}) { if (open(AH, $self->_get_local_filename())) { - # file is actually on disk. - $self->{is_on_filesystem} = 1; binmode AH; $self->{datasize} = (stat(AH))[7]; close(AH); diff --git a/Bugzilla/Config/Attachment.pm b/Bugzilla/Config/Attachment.pm index 5bf854293..580ec46d9 100644 --- a/Bugzilla/Config/Attachment.pm +++ b/Bugzilla/Config/Attachment.pm @@ -38,14 +38,6 @@ sub get_param_list { }, { - name => 'xsendfile_header', - type => 's', - choices => ['off', 'X-Sendfile', 'X-Accel-Redirect', 'X-LIGHTTPD-send-file'], - default => 'off', - checker => \&check_multi - }, - - { name => 'maxattachmentsize', type => 't', default => '1000', |