Permalink
Browse files

MERGE 498:499 FROM https://svn.perl.org/qpsmtpd/trunk

Better fix for pipe being closed bug


git-svn-id: https://svn.perl.org/qpsmtpd/branches/0.31@500 958fd67b-6ff1-0310-b445-bb7760255be9
  • Loading branch information...
Matt Sergeant
Matt Sergeant committed Jul 12, 2005
1 parent 11da7e2 commit f0b31cbb9be44f8a9a9fcb9df8816b3cf6ddbfb5
Showing with 2 additions and 6 deletions.
  1. +2 −6 plugins/queue/qmail-queue
@@ -41,7 +41,8 @@ sub hook_queue {
# these bits inspired by Peter Samuels "qmail-queue wrapper"
pipe(MESSAGE_READER, MESSAGE_WRITER) or die("Could not create message pipe");
pipe(ENVELOPE_READER, ENVELOPE_WRITER) or die("Could not create envelope pipe");
-
+
+ local $SIG{PIPE} = sub { die "SIGPIPE" };
my $child = fork();
not defined $child and die("Could not fork");
@@ -55,10 +56,6 @@ sub hook_queue {
close MESSAGE_READER or die("close msg reader fault");
close ENVELOPE_READER or die("close envelope reader fault");
- # Note - technically there's a race here because if the exec() below
- # fails and the writes to MESSAGE_WRITER block we get a deadlocked process.
- # This check to see if(eof(PIPE)) will catch "most" of these problems.
- die "Message pipe has been closed" if eof(MESSAGE_WRITER);
$transaction->header->print(\*MESSAGE_WRITER);
$transaction->body_resetpos;
while (my $line = $transaction->body_getline) {
@@ -68,7 +65,6 @@ sub hook_queue {
my @rcpt = map { "T" . $_->address } $transaction->recipients;
my $from = "F".($transaction->sender->address|| "" );
- die "Envelope pipe has been closed" if eof(ENVELOPE_WRITER);
print ENVELOPE_WRITER "$from\0", join("\0",@rcpt), "\0\0"
or return(DECLINED,"Could not print addresses to queue");

0 comments on commit f0b31cb

Please sign in to comment.