From 7c23e334a80bc1a4cdb8d7e9d2010e2738335207 Mon Sep 17 00:00:00 2001
From: Martin Edenhofer <me@edenhofer.de>
Date: Thu, 1 Dec 2016 16:59:34 +0100
Subject: [PATCH] Disable ssl on on ssl ports.

---
 app/models/channel/driver/imap.rb | 5 +++++
 app/models/channel/driver/pop3.rb | 5 +++++
 2 files changed, 10 insertions(+)

diff --git a/app/models/channel/driver/imap.rb b/app/models/channel/driver/imap.rb
index 733efd836..0f55f9c9f 100644
--- a/app/models/channel/driver/imap.rb
+++ b/app/models/channel/driver/imap.rb
@@ -68,6 +68,11 @@ example
     end
     if options.key?(:port) && !options[:port].empty?
       port = options[:port]
+
+      # disable ssl for non ssl ports
+      if port == 143 && !options.key?(:ssl)
+        ssl = false
+      end
     end
 
     Rails.logger.info "fetching imap (#{options[:host]}/#{options[:user]} port=#{port},ssl=#{ssl})"
diff --git a/app/models/channel/driver/pop3.rb b/app/models/channel/driver/pop3.rb
index a227b68eb..295e34fc7 100644
--- a/app/models/channel/driver/pop3.rb
+++ b/app/models/channel/driver/pop3.rb
@@ -53,6 +53,11 @@ returns
     end
     if options.key?(:port) && !options[:port].empty?
       port = options[:port]
+
+      # disable ssl for non ssl ports
+      if port == 110 && !options.key?(:ssl)
+        ssl = false
+      end
     end
 
     Rails.logger.info "fetching pop3 (#{options[:host]}/#{options[:user]} port=#{port},ssl=#{ssl})"