bug #59404 [Mailer] Fix SMTP stream EOF handling on Windows by using feof() (skmedix)

nicolas-grekas · nicolas-grekas · commit 351a2ecdbfd1 · 2025-01-09T16:42:20.000+01:00
This PR was merged into the 6.4 branch. Discussion ---------- [Mailer] Fix SMTP stream EOF handling on Windows by using feof() | Q | A | ------------- | --- | Branch? | 6.4 | Bug fix? | yes | New feature? | no  | Deprecations? | no  | Issues | Fix #59351 | License | MIT  Full explanation of this change here: #59351 (comment) Help with tests would be appreciated. Commits ------- ed18c7c [Mailer] Fix SMTP stream EOF handling on Windows by using feof()
diff --git a/src/Symfony/Component/Mailer/Transport/Smtp/Stream/AbstractStream.php b/src/Symfony/Component/Mailer/Transport/Smtp/Stream/AbstractStream.php
@@ -80,11 +80,10 @@ public function readLine(): string
 
         $line = @fgets($this->out);
         if ('' === $line || false === $line) {
-            $metas = stream_get_meta_data($this->out);
-            if ($metas['timed_out']) {
+            if (stream_get_meta_data($this->out)['timed_out']) {
                 throw new TransportException(sprintf('Connection to "%s" timed out.', $this->getReadConnectionDescription()));
             }
-            if ($metas['eof']) {
+            if (feof($this->out)) { // don't use "eof" metadata, it's not accurate on Windows
                 throw new TransportException(sprintf('Connection to "%s" has been closed unexpectedly.', $this->getReadConnectionDescription()));
             }
             if (false === $line) {

Original file line number	Diff line number	Diff line change
`@@ -80,11 +80,10 @@ public function readLine(): string`
`80`	`80`
`81`	`81`	`$line = @fgets($this->out);`
`82`	`82`	`if ('' === $line \|\| false === $line) {`
`83`		`- $metas = stream_get_meta_data($this->out);`
`84`		`- if ($metas['timed_out']) {`
	`83`	`+ if (stream_get_meta_data($this->out)['timed_out']) {`
`85`	`84`	`throw new TransportException(sprintf('Connection to "%s" timed out.', $this->getReadConnectionDescription()));`
`86`	`85`	`}`
`87`		`- if ($metas['eof']) {`
	`86`	`+ if (feof($this->out)) { // don't use "eof" metadata, it's not accurate on Windows`
`88`	`87`	`throw new TransportException(sprintf('Connection to "%s" has been closed unexpectedly.', $this->getReadConnectionDescription()));`
`89`	`88`	`}`
`90`	`89`	`if (false === $line) {`