[Mailer] Fix sendmail transport not handling failure

aboks · aboks · commit 3dee58ccb72e · 2024-03-11T15:46:17.000+01:00
diff --git a/src/Symfony/Component/Mailer/Transport/Smtp/Stream/AbstractStream.php b/src/Symfony/Component/Mailer/Transport/Smtp/Stream/AbstractStream.php
@@ -27,6 +27,7 @@ abstract class AbstractStream
     protected $stream;
     protected $in;
     protected $out;
+    protected $err;
 
     private $debug = '';
 
@@ -65,7 +66,7 @@ abstract public function initialize(): void;
 
     public function terminate(): void
     {
-        $this->stream = $this->out = $this->in = null;
+        $this->stream = $this->err = $this->out = $this->in = null;
     }
 
     public function readLine(): string
diff --git a/src/Symfony/Component/Mailer/Transport/Smtp/Stream/ProcessStream.php b/src/Symfony/Component/Mailer/Transport/Smtp/Stream/ProcessStream.php
@@ -45,14 +45,21 @@ public function initialize(): void
         }
         $this->in = &$pipes[0];
         $this->out = &$pipes[1];
+        $this->err = &$pipes[2];
     }
 
     public function terminate(): void
     {
         if (null !== $this->stream) {
             fclose($this->in);
+            $out = stream_get_contents($this->out);
             fclose($this->out);
-            proc_close($this->stream);
+            $err = stream_get_contents($this->err);
+            fclose($this->err);
+            $exitCode = proc_close($this->stream);
+            if ($exitCode !== 0) {
+                throw new TransportException('Process failed with exit code '.$exitCode.': '.$out.$err);
+            }
         }
 
         parent::terminate();

Original file line number	Diff line number	Diff line change
`@@ -27,6 +27,7 @@ abstract class AbstractStream`
`27`	`27`	`protected $stream;`
`28`	`28`	`protected $in;`
`29`	`29`	`protected $out;`
	`30`	`+ protected $err;`
`30`	`31`
`31`	`32`	`private $debug = '';`
`32`	`33`
`@@ -65,7 +66,7 @@ abstract public function initialize(): void;`
`65`	`66`
`66`	`67`	`public function terminate(): void`
`67`	`68`	`{`
`68`		`- $this->stream = $this->out = $this->in = null;`
	`69`	`+ $this->stream = $this->err = $this->out = $this->in = null;`
`69`	`70`	`}`
`70`	`71`
`71`	`72`	`public function readLine(): string`
Original file line number	Diff line number	Diff line change
`@@ -45,14 +45,21 @@ public function initialize(): void`
`45`	`45`	`}`
`46`	`46`	`$this->in = &$pipes[0];`
`47`	`47`	`$this->out = &$pipes[1];`
	`48`	`+ $this->err = &$pipes[2];`
`48`	`49`	`}`
`49`	`50`
`50`	`51`	`public function terminate(): void`
`51`	`52`	`{`
`52`	`53`	`if (null !== $this->stream) {`
`53`	`54`	`fclose($this->in);`
	`55`	`+ $out = stream_get_contents($this->out);`
`54`	`56`	`fclose($this->out);`
`55`		`- proc_close($this->stream);`
	`57`	`+ $err = stream_get_contents($this->err);`
	`58`	`+ fclose($this->err);`
	`59`	`+ $exitCode = proc_close($this->stream);`
	`60`	`+ if ($exitCode !== 0) {`
	`61`	`+ throw new TransportException('Process failed with exit code '.$exitCode.': '.$out.$err);`
	`62`	`+ }`
`56`	`63`	`}`
`57`	`64`
`58`	`65`	`parent::terminate();`