From 77f8b0db8d6b95fde7ca8b7a9dcd0f42f0f97af5 Mon Sep 17 00:00:00 2001
From: aamine <aamine@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Fri, 22 Sep 2000 06:44:59 +0000
Subject: [PATCH] aamine * lib/net/http.rb: too early parameter expantion in
 string.

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

diff --git a/ChangeLog b/ChangeLog
index 1eb75bae02..c3876ae215 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Fri Sep 22 15:46:21 2000  Minero Aoki  <aamine@dp.u-netsurf.ne.jp>
+
+	* lib/net/http.rb: too early parameter expantion in string.
+
 Fri Sep 22 13:58:51 2000  WATANABE Hirofumi  <eban@os.rim.or.jp>
 
 	* ext/extmk.rb.in: don't use default $:
@@ -35,7 +39,7 @@ Thu Sep 21 17:23:05 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 Thu Sep 21 15:59:23 2000  Minero Aoki  <aamine@dp.u-netsurf.ne.jp>
 
-	* lib/net/protocol.rb, smtp.rb, pop.rb, http.rb: 1.1.28.
+	* lib/net/protocol.rb, smtp.rb, pop.rb, http.rb: 1.1.29.
 
 	* lib/net/http.rb: HTTPReadAdapter -> HTTPResponseReceiver
 
diff --git a/lib/net/http.rb b/lib/net/http.rb
index a5ccb70b8c..ea5c991e60 100644
--- a/lib/net/http.rb
+++ b/lib/net/http.rb
@@ -107,13 +107,13 @@ You can get it from RAA
 
     # this is wrong
     http.get2( '/index.html' ) do |recv|
-      print recv.header.body   # body is not read yet!!!
+      print recv.response.body   # body is not read yet!!!
     end
 
     # but this is ok
     http.get2( '/index.html' ) do |recv|
-      recv.body                # read body and set recv.header.body
-      print recv.header.body   # ref
+      recv.body                  # read body and set recv.header.body
+      print recv.response.body   # ref
     end
 
 : head2( path, header = nil )
@@ -180,7 +180,7 @@ All "key" is case-insensitive.
   iterate for each field name and value pair
 
 : code
-  HTTP result code. For example, '302'
+  HTTP result code string. For example, '302'
 
 : message
   HTTP result message. For example, 'Not Found'
@@ -444,13 +444,13 @@ module Net
 
     def HTTP.Proxy( p_addr, p_port = nil )
       klass = super
-      klass.module_eval %-
+      klass.module_eval( <<SRC, 'http.rb', __LINE__ + 1 )
         def edit_path( path )
           'http://' + address +
-              (@port == HTTP.port ? '' : ":#{@port}") +
+              (@port == HTTP.port ? '' : ':' + @port.to_s) +
               path
         end
-      -
+SRC
       klass
     end