diff options
author | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-10-27 09:29:26 +0000 |
---|---|---|
committer | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-10-27 09:29:26 +0000 |
commit | 018837b84f26adf1dd43ff0f41b211a41f5289e8 (patch) | |
tree | 4e552ee5749181b14dd80da1eb05d0dc9ed86645 /lib | |
parent | 6ffdbac5edcdeb0a9c916735cab125674c5a693d (diff) | |
download | ruby-018837b84f26adf1dd43ff0f41b211a41f5289e8.tar.gz |
* node.h (NODE_TYPESHIFT): allow 4 more bits for line numbers.
[ruby-talk:117841]
* ruby.h (FL_ABLE): nodes are not subject for flag operations.
* io.c (ARGF_FORWARD): should have specified argv explicitly,
since we no longer have frame->argv saved. [ruby-dev:24602]
* string.c (RESIZE_CAPA): check string attribute before modifying
capacity member of string structure. [ruby-dev:24594]
* ext/zlib/zlib.c (gzreader_gets): use memchr() to to gain
performance. [ruby-talk:117701]
* sprintf.c (rb_f_sprintf): raise ArgumentError for extra
arguments, unless (digit)$ style used.
* io.c (rb_io_fptr_finalize): leave stdin/stdout/stderr open in
interpreter termination. [ruby-dev:24579]
* eval.c (frame_free): Guy Decoux solved the leak problem.
Thanks. [ruby-core:03549]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@7121 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib')
-rw-r--r-- | lib/cgi.rb | 9 | ||||
-rw-r--r-- | lib/ostruct.rb | 8 |
2 files changed, 14 insertions, 3 deletions
diff --git a/lib/cgi.rb b/lib/cgi.rb index 463b17d98a..afc99ab7ca 100644 --- a/lib/cgi.rb +++ b/lib/cgi.rb @@ -770,7 +770,7 @@ class CGI # cookie1.domain = 'domain' # cookie1.expires = Time.now + 30 # cookie1.secure = true - class Cookie < SimpleDelegator + class Cookie < DelegateClass(Array) # Create a new CGI::Cookie object. # @@ -1012,10 +1012,13 @@ class CGI end c = if bufsize < content_length - stdinput.read(bufsize) or '' + stdinput.read(bufsize) else - stdinput.read(content_length) or '' + stdinput.read(content_length) end + if c.nil? + raise EOFError, "bad content body" + end buf.concat(c) content_length -= c.size end diff --git a/lib/ostruct.rb b/lib/ostruct.rb index 464fff0cdf..8d8484caf5 100644 --- a/lib/ostruct.rb +++ b/lib/ostruct.rb @@ -58,6 +58,13 @@ class OpenStruct @table = @table.dup end + def new_ostruct_member(name) + self.instance_eval %{ + def #{name}; @table[:#{name}]; end + def #{name}=(x); @table[:#{name}] = x; end + } + end + def method_missing(mid, *args) # :nodoc: mname = mid.id2name len = args.length @@ -70,6 +77,7 @@ class OpenStruct end mname.chop! @table[mname.intern] = args[0] + self.new_ostruct_member(mname) elsif len == 0 @table[mid] else |