summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorshugo <shugo@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-02-06 13:57:10 +0000
committershugo <shugo@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-02-06 13:57:10 +0000
commit69c3348b7997cb5efc2bf55bb11ea32dc976dcba (patch)
tree739478b58e132ddd7f112d75397e2cc5fa76f46d
parentbc885aeae60d6e00a4de3852640221c30c685ed1 (diff)
* lib/net/imap.rb (receive_responses): does not hang when an unexpected BYE
response received. fixed [ruby-core:27944]. Thanks, Bob Potter. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@26599 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--lib/net/imap.rb5
-rw-r--r--test/net/imap/test_imap.rb28
2 files changed, 31 insertions, 2 deletions
diff --git a/lib/net/imap.rb b/lib/net/imap.rb
index 3a8145e03cc..980fed61cad 100644
--- a/lib/net/imap.rb
+++ b/lib/net/imap.rb
@@ -1017,7 +1017,8 @@ module Net
end
def receive_responses
- while true
+ connection_closed = false
+ until connection_closed
synchronize do
@exception = nil
end
@@ -1054,7 +1055,7 @@ module Net
if resp.name == "BYE" && @logout_command_tag.nil?
@sock.close
@exception = ByeResponseError.new(resp)
- break
+ connection_closed = true
end
when ContinuationRequest
@continuation_request_arrival.signal
diff --git a/test/net/imap/test_imap.rb b/test/net/imap/test_imap.rb
index f1471c0d0b2..b7714dff1a3 100644
--- a/test/net/imap/test_imap.rb
+++ b/test/net/imap/test_imap.rb
@@ -279,6 +279,34 @@ class IMAPTest < Test::Unit::TestCase
end
end
+ def test_unexpected_bye
+ server = TCPServer.new(0)
+ port = server.addr[1]
+ Thread.start do
+ begin
+ sock = server.accept
+ begin
+ sock.print("* OK Gimap ready for requests from 75.101.246.151 33if2752585qyk.26\r\n")
+ sock.gets
+ sock.print("* BYE System Error 33if2752585qyk.26\r\n")
+ ensure
+ sock.close
+ end
+ rescue
+ end
+ end
+ begin
+ begin
+ imap = Net::IMAP.new("localhost", :port => port)
+ assert_raise(Net::IMAP::ByeResponseError) do
+ imap.login("user", "password")
+ end
+ end
+ ensure
+ server.close
+ end
+ end
+
private
def imaps_test