* lib/net/http.rb (canonical_each): fix merge miss.

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

2 files changed, 5 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index 58c074cef7..61c5eaeee4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Mon Feb  2 13:31:51 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* lib/net/http.rb (canonical_each): fix merge miss.
+
 Mon Feb  2 01:54:00 2004  Tanaka Akira  <akr@m17n.org>
 
 	* lib/pp.rb (Struct#pretty_print): make it 1.8 style.
diff --git a/lib/net/http.rb b/lib/net/http.rb
index 36bc6067b2..f51981477c 100644
--- a/lib/net/http.rb
+++ b/lib/net/http.rb
@@ -970,7 +970,7 @@ module Net # :nodoc:
     end
 
     # As for #each_header, except the keys are provided in capitalized form.
-    def each_capitalized
+    def canonical_each
       @header.each do |k,v|
         yield canonical(k), v
       end