Merge remote-tracking branch 'origin/email-simple-mem' into master

[public-inbox.git] / lib / PublicInbox / NNTP.pm

diff --git a/lib/PublicInbox/NNTP.pm b/lib/PublicInbox/NNTP.pm
index 82762b1a466e2cf392aae9dd6f46fa54868bb633..26bc679f2996b67e0008b8f90bfb1a1d9732521f 100644 (file)
--- a/lib/PublicInbox/NNTP.pm
+++ b/lib/PublicInbox/NNTP.pm
@@ -487,24 +487,23 @@ find_mid:
 found:
        my $smsg = $ng->over->get_art($n) or return $err;
        my $msg = $ng->msg_by_smsg($smsg) or return $err;
-       my $s = Email::Simple->new($msg);
-       if ($set_headers) {
-               set_nntp_headers($self, $s->header_obj, $ng, $n, $mid);
 
-               # must be last
-               $s->body_set('') if ($set_headers == 2);
-       }
-       [ $n, $mid, $s, $smsg->bytes, $smsg->lines, $ng ];
+       # Email::Simple->new will modify $msg in-place as documented
+       # in its manpage, so what's left is the body and we won't need
+       # to call Email::Simple::body(), later
+       my $hdr = Email::Simple->new($msg)->header_obj;
+       set_nntp_headers($self, $hdr, $ng, $n, $mid) if $set_headers;
+       [ $n, $mid, $msg, $hdr ];
 }
 
-sub simple_body_write ($$) {
-       my ($self, $s) = @_;
-       my $body = $s->body;
-       $s->body_set('');
-       $body =~ s/^\./../smg;
-       $body =~ s/(?<!\r)\n/\r\n/sg;
-       msg_more($self, $body);
-       msg_more($self, "\r\n") unless $body =~ /\r\n\z/s;
+sub msg_body_write ($$) {
+       my ($self, $msg) = @_;
+
+       # these can momentarily double the memory consumption :<
+       $$msg =~ s/^\./../smg;
+       $$msg =~ s/(?<!\r)\n/\r\n/sg; # Alpine barfs without this
+       $$msg .= "\r\n" unless $$msg =~ /\r\n\z/s;
+       msg_more($self, $$msg);
        '.'
 }
 
@@ -513,40 +512,40 @@ sub set_art {
        $self->{article} = $art if defined $art && $art =~ /\A[0-9]+\z/;
 }
 
-sub _header ($) {
-       my $hdr = $_[0]->header_obj->as_string;
+sub msg_hdr_write ($$$) {
+       my ($self, $hdr, $body_follows) = @_;
+       $hdr = $hdr->as_string;
        utf8::encode($hdr);
-       $hdr =~ s/(?<!\r)\n/\r\n/sg;
+       $hdr =~ s/(?<!\r)\n/\r\n/sg; # Alpine barfs without this
 
        # for leafnode compatibility, we need to ensure Message-ID headers
        # are only a single line.  We can't subclass Email::Simple::Header
        # and override _default_fold_at in here, either; since that won't
        # affect messages already in the archive.
        $hdr =~ s/^(Message-ID:)[ \t]*\r\n[ \t]+([^\r]+)\r\n/$1 $2\r\n/igsm;
-
-       $hdr
+       $hdr .= "\r\n" if $body_follows;
+       msg_more($self, $hdr);
 }
 
 sub cmd_article ($;$) {
        my ($self, $art) = @_;
        my $r = art_lookup($self, $art, 1);
        return $r unless ref $r;
-       my ($n, $mid, $s) = @$r;
+       my ($n, $mid, $msg, $hdr) = @$r;
        set_art($self, $art);
        more($self, "220 $n <$mid> article retrieved - head and body follow");
-       msg_more($self, _header($s));
-       msg_more($self, "\r\n");
-       simple_body_write($self, $s);
+       msg_hdr_write($self, $hdr, 1);
+       msg_body_write($self, $msg);
 }
 
 sub cmd_head ($;$) {
        my ($self, $art) = @_;
        my $r = art_lookup($self, $art, 2);
        return $r unless ref $r;
-       my ($n, $mid, $s) = @$r;
+       my ($n, $mid, undef, $hdr) = @$r;
        set_art($self, $art);
        more($self, "221 $n <$mid> article retrieved - head follows");
-       msg_more($self, _header($s));
+       msg_hdr_write($self, $hdr, 0);
        '.'
 }
 
@@ -554,17 +553,17 @@ sub cmd_body ($;$) {
        my ($self, $art) = @_;
        my $r = art_lookup($self, $art, 0);
        return $r unless ref $r;
-       my ($n, $mid, $s) = @$r;
+       my ($n, $mid, $msg) = @$r;
        set_art($self, $art);
        more($self, "222 $n <$mid> article retrieved - body follows");
-       simple_body_write($self, $s);
+       msg_body_write($self, $msg);
 }
 
 sub cmd_stat ($;$) {
        my ($self, $art) = @_;
        my $r = art_lookup($self, $art, 0);
        return $r unless ref $r;
-       my ($n, $mid, undef) = @$r;
+       my ($n, $mid) = @$r;
        set_art($self, $art);
        "223 $n <$mid> article retrieved - request text separately";
 }
@@ -792,7 +791,7 @@ sub hdr_mid_prefix ($$$$$) {
 }
 
 sub hdr_mid_response ($$$$$$) {
-       my ($self, $xhdr, $ng, $n, $mid, $v) = @_; # r: art_lookup result
+       my ($self, $xhdr, $ng, $n, $mid, $v) = @_;
        my $res = '';
        if ($xhdr) {
                $res .= r221 . "\r\n";