From a6499aee0ef4e9bbf2ee25830b9000b1c43ee16b Mon Sep 17 00:00:00 2001 From: Andre Klapper Date: Fri, 17 May 2024 16:18:01 +0200 Subject: [PATCH] PHPMailer: Remove a check for PHP 5.0 Summary: Phorge requires PHP 5.5, thus remove a version check for PHP 5.0. Compare the same code in https://github.com/PHPMailer/PHPMailer/blob/master/src/POP3.php#L282-L283 Test Plan: Carefully read the code. Reviewers: O1 Blessed Committers, speck Reviewed By: O1 Blessed Committers, speck Subscribers: tobiaswiese, valerio.bozzolan, Matthew, Cigaryno Differential Revision: https://we.phorge.it/D25661 --- externals/phpmailer/class.pop3.php | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/externals/phpmailer/class.pop3.php b/externals/phpmailer/class.pop3.php index f9fd3b2edb..c48191bd72 100644 --- a/externals/phpmailer/class.pop3.php +++ b/externals/phpmailer/class.pop3.php @@ -239,16 +239,7 @@ class POP3 { } // Increase the stream time-out - - // Check for PHP 4.3.0 or later - if (version_compare(phpversion(), '5.0.0', 'ge')) { - stream_set_timeout($this->pop_conn, $tval, 0); - } else { - // Does not work on Windows - if (substr(PHP_OS, 0, 3) !== 'WIN') { - socket_set_timeout($this->pop_conn, $tval, 0); - } - } + stream_set_timeout($this->pop_conn, $tval, 0); // Get the POP3 server response $pop3_response = $this->getResponse(); @@ -404,4 +395,4 @@ class POP3 { // End of class } -?> \ No newline at end of file +?>