From 461dabc3e1e7ef456358c15219b2b343c02ff43e Mon Sep 17 00:00:00 2001 From: Robert Date: Fri, 29 Oct 2010 22:19:30 -0700 Subject: Revert "Spool body when $transaction->body_fh() is called" This reverts commit a52660a646012691f993cca821c00fe05cff08bb. See http://www.nntp.perl.org/group/perl.qpsmtpd/2010/10/msg9453.html for discussion. --- Changes | 2 ++ lib/Qpsmtpd/Transaction.pm | 5 +---- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/Changes b/Changes index a864b4f..a3437ef 100644 --- a/Changes +++ b/Changes @@ -16,6 +16,8 @@ Next Version assorted documentation cleanups (Steve Kemp, Robert Spier) + Revert "Spool body when $transaction->body_fh() is called" + 0.84 April 7, 2010 uribl: fix scan-headers option (Jost Krieger, Robert Spier) diff --git a/lib/Qpsmtpd/Transaction.pm b/lib/Qpsmtpd/Transaction.pm index 1dec547..a828fb6 100644 --- a/lib/Qpsmtpd/Transaction.pm +++ b/lib/Qpsmtpd/Transaction.pm @@ -213,10 +213,7 @@ sub body_as_string { } sub body_fh { - my ($self) = @_; - # Spool to disk if we weren't already doing so - $self->body_spool() unless $self->{_filename}; - return $self->{_body_file}; + return shift->{_body_file}; } sub dup_body_fh { -- 1.7.2.2