summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoraamine <aamine@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2004-01-07 11:42:21 +0000
committeraamine <aamine@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2004-01-07 11:42:21 +0000
commit4642ffdf4a41073a1382f49072e5f2f062485687 (patch)
tree4f0b8725f22c7bac5542e497ec55befe83c6af8f
parentafda1bdb62ce3f6256b73f64b4cf2c93fcd2ade1 (diff)
downloadruby-4642ffdf4a41073a1382f49072e5f2f062485687.tar.gz
ruby-4642ffdf4a41073a1382f49072e5f2f062485687.tar.xz
ruby-4642ffdf4a41073a1382f49072e5f2f062485687.zip
* lib/net/http.rb (HTTPHeader#content_length): should return nil unless header exists. [ruby-dev:22519]
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@5401 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--lib/net/http.rb3
2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index cac483ce8..c492657b3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Jan 7 20:42:06 2004 Minero Aoki <aamine@loveruby.net>
+
+ * lib/net/http.rb (HTTPHeader#content_length): should return nil
+ unless header exists. [ruby-dev:22519]
+
Wed Jan 7 14:26:05 2004 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
* ext/tk/lib/tk.rb (TkPanedWindow): use epath for embedded windows.
diff --git a/lib/net/http.rb b/lib/net/http.rb
index 90c473eaf..90843576b 100644
--- a/lib/net/http.rb
+++ b/lib/net/http.rb
@@ -1032,7 +1032,8 @@ module Net # :nodoc:
# Returns an Integer object which represents the Content-Length: header field
# or +nil+ if that field is not provided.
def content_length
- len = @header['content-length'].to_s.slice(/\d+/) or
+ return nil unless @header.key?('content-length')
+ len = @header['content-length'].slice(/\d+/) or
raise HTTPHeaderSyntaxError, 'wrong Content-Length format'
len.to_i
end