byterazor/qpsmtpd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

allow messages with no body: Robin's patch

Browse Source 
This is Robin's patch from here: http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/mail-mta/qpsmtpd/files/qpsmtpd-0.83-accept-empty-email.patch?view=markup
This commit is contained in:
Matt Simerson 2012-07-20 11:35:20 -04:00
parent 376bd492cd
commit df715db16b
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/Qpsmtpd/SMTP.pm
View File

@ -634,7 +634,10 @@ sub data_respond {
my $timeout = $self->config('timeout'); my $timeout = $self->config('timeout');
while (defined($_ = $self->getline($timeout))) { while (defined($_ = $self->getline($timeout))) {
$complete++, last if $_ eq ".\r\n"; if ( $_ eq ".\r\n" ) {
$complete++;
$_ eq '';
};
$i++; $i++;
# should probably use \012 and \015 in these checks instead of \r and \n ... # should probably use \012 and \015 in these checks instead of \r and \n ...
@ -650,7 +653,7 @@ sub data_respond {
unless (($max_size and $size > $max_size)) { unless (($max_size and $size > $max_size)) {
s/\r\n$/\n/; s/\r\n$/\n/;
s/^\.\./\./; s/^\.\./\./;
if ($in_header and m/^$/) { if ($in_header && (m/^$/ || $complete > 0)) {
$in_header = 0; $in_header = 0;
my @headers = split /^/m, $buffer; my @headers = split /^/m, $buffer;
@ -693,9 +696,10 @@ sub data_respond {
# copy all lines into the spool file, including the headers # copy all lines into the spool file, including the headers
# we will create a new header later before sending onwards # we will create a new header later before sending onwards
$self->transaction->body_write($_); $self->transaction->body_write($_) if ! $complete;
$size += length $_; $size += length $_;
} }
last if $complete > 0;
#$self->log(LOGDEBUG, "size is at $size\n") unless ($i % 300); #$self->log(LOGDEBUG, "size is at $size\n") unless ($i % 300);
} }