summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoraamine <aamine@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2003-06-06 07:05:52 +0000
committeraamine <aamine@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2003-06-06 07:05:52 +0000
commit1fa5c630cda65f69d2ccffb614f45b5e9470b167 (patch)
treeb2c9897dc025eaf15f0f3de1a708a239eedb92d6
parent56796022a658e31133ee05c10718ca8af8e20045 (diff)
* lib/net/http.rb: define Net::HTTPResponse#to_ary for backward compatibility. [ruby-talk:72927]
* lib/net/protocol.rb: add warning. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@3913 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog7
-rw-r--r--lib/net/http.rb16
-rw-r--r--lib/net/protocol.rb8
3 files changed, 24 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index 0e03e5f6b5c..6f047bf5996 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Fri Jun 6 16:10:01 2003 Minero Aoki <aamine@loveruby.net>
+
+ * lib/net/http.rb: define Net::HTTPResponse#to_ary for backward
+ compatibility. [ruby-talk:72927]
+
+ * lib/net/protocol.rb: add warning.
+
Thu Jun 5 21:31:55 2003 Takaaki Uematsu <uema2x@jcom.home.ne.jp>
* wince/stdlib.c: add mblen().
diff --git a/lib/net/http.rb b/lib/net/http.rb
index b6a04d1bf5c..b7054464b8d 100644
--- a/lib/net/http.rb
+++ b/lib/net/http.rb
@@ -1181,7 +1181,7 @@ module Net
return unless initheader
initheader.each do |k,v|
key = k.downcase
- $stderr.puts "net/http: WARNING: duplicated HTTP header: #{k}" if @header.key?(key) and $VERBOSE
+ $stderr.puts "net/http: warning: duplicated HTTP header: #{k}" if @header.key?(key) and $VERBOSE
@header[key] = v.strip
end
@header['accept'] ||= '*/*'
@@ -1230,7 +1230,7 @@ module Net
@header.delete 'transfer-encoding'
unless @header['content-type']
- $stderr.puts 'net/http: WARNING: Content-Type did not set; using application/x-www-form-urlencoded' if $VERBOSE
+ $stderr.puts 'net/http: warning: Content-Type did not set; using application/x-www-form-urlencoded' if $VERBOSE
@header['content-type'] = 'application/x-www-form-urlencoded'
end
@@ -1598,12 +1598,22 @@ module Net
attr_reader :http_version
attr_reader :code
attr_reader :message
- alias msg message
+ alias msg message # for backward compatibility
def inspect
"#<#{self.class} #{@code} readbody=#{@read}>"
end
+ # For backward compatibility.
+ # To allow Net::HTTP 1.1 style assignment
+ # e.g.
+ # response, body = Net::HTTP.get(....)
+ #
+ def to_ary
+ warn "net/http: warning: old style assignment found at #{caller(1)[0]}" if $VERBOSE
+ [self, body()]
+ end
+
#
# response <-> exception relationship
#
diff --git a/lib/net/protocol.rb b/lib/net/protocol.rb
index c4dcce9e449..b58eec9475e 100644
--- a/lib/net/protocol.rb
+++ b/lib/net/protocol.rb
@@ -5,17 +5,17 @@
Copyright (c) 1999-2003 Yukihiro Matsumoto
Copyright (c) 1999-2003 Minero Aoki
-written & maintained by Minero Aoki <aamine@loveruby.net>
+written and maintained by Minero Aoki <aamine@loveruby.net>
This program is free software. You can re-distribute and/or
modify this program under the same terms as Ruby itself,
Ruby Distribute License or GNU General Public License.
-NOTE: You can find Japanese version of this document in
-the doc/net directory of the standard ruby interpreter package.
-
$Id$
+WARNING: This file is going to remove.
+Do not rely on the implementation written in this file.
+
=end
require 'socket'