protocol.rb smtp.rb pop.rb http.rb version 1.1.12

o protocol.rb:  update Net::Protocol::Proxy#connect
o protocol.rb:  ReplyCode is not a class
o http.rb:  header value does not include header name
o http.rb:  header is not a Hash, but HTTPResponse


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@659 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 6 insertions, 6 deletions

diff --git a/lib/net/smtp.rb b/lib/net/smtp.rb
index a1a2f5370f..e6b483252e 100644
--- a/lib/net/smtp.rb
+++ b/lib/net/smtp.rb
@@ -76,12 +76,12 @@ Net::Protocol
 
     def sendmail( mailsrc, fromaddr, toaddrs )
       do_ready fromaddr, toaddrs
-      @command.write_mail mailsrc
+      @command.write_mail mailsrc, nil
     end
 
     def ready( fromaddr, toaddrs, &block )
       do_ready fromaddr, toaddrs
-      @command.write_mail( &block )
+      @command.write_mail nil, block
     end
 
 
@@ -163,8 +163,8 @@ Net::Protocol
     end
 
 
-    def write_mail( mailsrc = nil, &block )
-      @socket.write_pendstr mailsrc, &block
+    def write_mail( mailsrc, block )
+      @socket.write_pendstr mailsrc, block
       check_reply SuccessCode
       end_critical
     end
@@ -189,7 +189,7 @@ Net::Protocol
       klass = case stat[0]
               when ?2 then SuccessCode
               when ?3 then ContinueCode
-              when ?4 then ServerBusyCode
+              when ?4 then ServerErrorCode
               when ?5 then
                 case stat[1]
                 when ?0 then SyntaxErrorCode
@@ -197,7 +197,7 @@ Net::Protocol
                 end
               end
 
-      klass.new( stat, arr.join('') )
+      Response.new( klass, stat, arr.join('') )
     end