[Mailer] Thrown TransportException when unable to read from socket

xdanik · xdanik · commit b49f580ed1ef · 2023-12-20T13:56:50.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
@@ -77,7 +77,7 @@ public function readLine(): string
             return '';
         }
 
-        $line = fgets($this->out);
+        $line = @fgets($this->out);
         if ('' === $line || false === $line) {
             $metas = stream_get_meta_data($this->out);
             if ($metas['timed_out']) {
@@ -86,6 +86,9 @@ public function readLine(): string
             if ($metas['eof']) {
                 throw new TransportException(sprintf('Connection to "%s" has been closed unexpectedly.', $this->getReadConnectionDescription()));
             }
+            if (false === $line) {
+                throw new TransportException(sprintf('Unable to read from connection to "%s".', $this->getReadConnectionDescription()));
+            }
         }
 
         $this->debug .= sprintf('< %s', $line);

Original file line number	Diff line number	Diff line change
`@@ -77,7 +77,7 @@ public function readLine(): string`
`77`	`77`	`return '';`
`78`	`78`	`}`
`79`	`79`
`80`		`- $line = fgets($this->out);`
	`80`	`+ $line = @fgets($this->out);`
`81`	`81`	`if ('' === $line \|\| false === $line) {`
`82`	`82`	`$metas = stream_get_meta_data($this->out);`
`83`	`83`	`if ($metas['timed_out']) {`
`@@ -86,6 +86,9 @@ public function readLine(): string`
`86`	`86`	`if ($metas['eof']) {`
`87`	`87`	`throw new TransportException(sprintf('Connection to "%s" has been closed unexpectedly.', $this->getReadConnectionDescription()));`
`88`	`88`	`}`
	`89`	`+ if (false === $line) {`
	`90`	`+ throw new TransportException(sprintf('Unable to read from connection to "%s".', $this->getReadConnectionDescription()));`
	`91`	`+ }`
`89`	`92`	`}`
`90`	`93`
`91`	`94`	`$this->debug .= sprintf('< %s', $line);`