merge revision(s) 24913:

* lib/cgi/cookie.rb (value): Keep CGI::Cookie#value in sync with the
	  cookie itself. A patch by Arthur Schreiber [ruby-core:17634]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@25817 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
shyouhei 2009-11-17 07:16:41 +00:00
parent 29929d799d
commit eaa8ca6b78
3 changed files with 13 additions and 8 deletions

View file

@ -1,3 +1,8 @@
Tue Nov 17 16:04:02 2009 Marc-Andre Lafortune <ruby-core@marc-andre.ca>
* lib/cgi/cookie.rb (value): Keep CGI::Cookie#value in sync with the
cookie itself. A patch by Arthur Schreiber [ruby-core:17634]
Tue Nov 17 15:49:00 2009 Marc-Andre Lafortune <ruby-core@marc-andre.ca>
* lib/irb/ext/multi-irb.rb: Fix arguments handling for shell commands

View file

@ -822,8 +822,8 @@ class CGI
super(@value)
end
attr_accessor("name", "value", "path", "domain", "expires")
attr_reader("secure")
attr_accessor("name", "path", "domain", "expires")
attr_reader("secure", "value")
# Set whether the Cookie is a secure cookie or not.
#
@ -833,16 +833,16 @@ class CGI
@secure
end
def value=(val)
@value.replace(Array(val))
end
# Convert the Cookie to its string representation.
def to_s
buf = ""
buf += @name + '='
if @value.kind_of?(String)
buf += CGI::escape(@value)
else
buf += @value.collect{|v| CGI::escape(v) }.join("&")
end
buf += @value.map { |v| CGI::escape(v) }.join("&")
if @domain
buf += '; domain=' + @domain

View file

@ -2,7 +2,7 @@
#define RUBY_RELEASE_DATE "2009-11-17"
#define RUBY_VERSION_CODE 187
#define RUBY_RELEASE_CODE 20091117
#define RUBY_PATCHLEVEL 208
#define RUBY_PATCHLEVEL 209
#define RUBY_VERSION_MAJOR 1
#define RUBY_VERSION_MINOR 8