From 63079969660592d464734b70ac2a2a90a1d297ea Mon Sep 17 00:00:00 2001
From: aamine <aamine@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sun, 5 Mar 2006 09:35:32 +0000
Subject: [PATCH] * lib/net/http.rb (send_request_with_body): #content_type
 never return false, use #main_type instead. [ruby-core:07476]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@10027 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog       | 5 +++++
 lib/net/http.rb | 4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 3cddc29e8e..77e6441bf5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sun Mar  5 18:35:03 2006  Minero Aoki  <aamine@loveruby.net>
+
+	* lib/net/http.rb (send_request_with_body): #content_type never
+	  return false, use #main_type instead. [ruby-core:07476]
+
 Sat Mar  4 15:26:40 2006  Tanaka Akira  <akr@m17n.org>
 
 	* gc.c (id2ref): fix symbol test.
diff --git a/lib/net/http.rb b/lib/net/http.rb
index 3f05d81073..87f42bfb66 100644
--- a/lib/net/http.rb
+++ b/lib/net/http.rb
@@ -1176,7 +1176,7 @@ module Net   #:nodoc:
     #
     def add_field(key, val)
       if @header.key?(key.downcase)
-        @header[key.downcase].concat [val]
+        @header[key.downcase].push val
       else
         @header[key.downcase] = [val]
       end
@@ -1504,7 +1504,7 @@ module Net   #:nodoc:
     def send_request_with_body(sock, ver, path, body)
       self.content_length = body.length
       delete 'Transfer-Encoding'
-      unless content_type()
+      unless main_type()
         warn 'net/http: warning: Content-Type did not set; using application/x-www-form-urlencoded' if $VERBOSE
         set_content_type 'application/x-www-form-urlencoded'
       end