vmail 1.9.6 → 1.9.7
Sign up to get free protection for your applications and to get access to all the features.
- data/lib/vmail/imap_client.rb +2 -2
- data/lib/vmail/showing_headers.rb +4 -1
- data/lib/vmail/version.rb +1 -1
- metadata +1 -1
data/lib/vmail/imap_client.rb
CHANGED
@@ -63,7 +63,7 @@ module Vmail
|
|
63
63
|
|
64
64
|
def close
|
65
65
|
log "Closing connection"
|
66
|
-
Timeout::timeout(
|
66
|
+
Timeout::timeout(5) do
|
67
67
|
@imap.close rescue Net::IMAP::BadResponseError
|
68
68
|
@imap.disconnect rescue IOError
|
69
69
|
end
|
@@ -75,7 +75,7 @@ module Vmail
|
|
75
75
|
mailbox = mailbox_aliases[mailbox]
|
76
76
|
end
|
77
77
|
log "Selecting mailbox #{mailbox.inspect}"
|
78
|
-
reconnect_if_necessary(
|
78
|
+
reconnect_if_necessary(30) do
|
79
79
|
log @imap.select(mailbox)
|
80
80
|
end
|
81
81
|
log "Done"
|
@@ -58,7 +58,10 @@ module Vmail
|
|
58
58
|
elsif address_struct.name
|
59
59
|
"#{Mail::Encodings.unquote_and_convert_to(address_struct.name, 'UTF-8')} <#{[address_struct.mailbox, address_struct.host].join('@')}>"
|
60
60
|
else
|
61
|
-
[
|
61
|
+
[
|
62
|
+
(address_struct.mailbox ? Mail::Encodings.unquote_and_convert_to(address_struct.mailbox, 'UTF-8') : ""),
|
63
|
+
(address_struct.host ? Mail::Encodings.unquote_and_convert_to(address_struct.host, 'UTF-8'): "")
|
64
|
+
].join('@')
|
62
65
|
end
|
63
66
|
|
64
67
|
end
|
data/lib/vmail/version.rb
CHANGED