diff options
Diffstat (limited to 'lib/net')
| -rw-r--r-- | lib/net/pop.rb | 6 | ||||
| -rw-r--r-- | lib/net/smtp.rb | 12 |
2 files changed, 9 insertions, 9 deletions
diff --git a/lib/net/pop.rb b/lib/net/pop.rb index 74a53951c7..ebf1085d55 100644 --- a/lib/net/pop.rb +++ b/lib/net/pop.rb @@ -889,7 +889,7 @@ module Net def initialize(sock) @socket = sock - @error_occured = false + @error_occurred = false res = check_response(critical { recv_response() }) @apop_stamp = res.slice(/<[!-~]+@[!-~]+>/) end @@ -1007,11 +1007,11 @@ module Net end def critical - return '+OK dummy ok response' if @error_occured + return '+OK dummy ok response' if @error_occurred begin return yield() rescue Exception - @error_occured = true + @error_occurred = true raise end end diff --git a/lib/net/smtp.rb b/lib/net/smtp.rb index 01f8b2b1f0..4ed7e746d9 100644 --- a/lib/net/smtp.rb +++ b/lib/net/smtp.rb @@ -215,7 +215,7 @@ module Net @started = false @open_timeout = 30 @read_timeout = 60 - @error_occured = false + @error_occurred = false @debug_output = nil @tls = false @starttls = false @@ -605,17 +605,17 @@ module Net rescue SMTPError if @esmtp @esmtp = false - @error_occured = false + @error_occurred = false retry end raise end def do_finish - quit if @socket and not @socket.closed? and not @error_occured + quit if @socket and not @socket.closed? and not @error_occurred ensure @started = false - @error_occured = false + @error_occurred = false @socket.close if @socket and not @socket.closed? @socket = nil end @@ -942,11 +942,11 @@ module Net end def critical - return '200 dummy reply code' if @error_occured + return '200 dummy reply code' if @error_occurred begin return yield() rescue Exception - @error_occured = true + @error_occurred = true raise end end |