summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoraamine <aamine@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2000-09-22 06:44:59 +0000
committeraamine <aamine@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2000-09-22 06:44:59 +0000
commit77f8b0db8d6b95fde7ca8b7a9dcd0f42f0f97af5 (patch)
treee34506ff53cc87c5f0cbacb6eb2d88dd3ae7af18
parent5bb84ef24675ee3083ad2a0917b19420112beeaa (diff)
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
-rw-r--r--ChangeLog6
-rw-r--r--lib/net/http.rb14
2 files changed, 12 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog
index 1eb75bae026..c3876ae2156 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 a5ccb70b8c4..ea5c991e60a 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