Fix bug where imap_conn_option's 'socket' was ignored (roundcube#9566)

respiranto · Aug 2, 2024 · fdf19f3 · fdf19f3
1 parent c821822
commit fdf19f3
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -68,6 +68,7 @@
 - Fix bug where an unhandled exception was caused by an invalid image attachment (#9475)
 - Fix bug where a long subject title could not be displayed in some cases (#9416)
 - Fix infinite loop when parsing malformed Sieve script (#9562)
+- Fix bug where imap_conn_option's 'socket' was ignored (#9566)
 
 ## Release 1.6.7
 

diff --git a/program/lib/Roundcube/rcube_imap_generic.php b/program/lib/Roundcube/rcube_imap_generic.php
@@ -1039,7 +1039,7 @@ protected function _connect($host)
         }
 
         if (!empty($this->prefs['socket_options'])) {
-            $options = array_intersect_key($this->prefs['socket_options'], ['ssl' => 1]);
+            $options = array_intersect_key($this->prefs['socket_options'], ['ssl' => 1, 'socket' => 1]);
             $context = stream_context_create($options);
             $this->fp = stream_socket_client($host . ':' . $port, $errno, $errstr,
                 $this->prefs['timeout'], \STREAM_CLIENT_CONNECT, $context);