kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

merge revision(s) 20884:

Browse source 
* lib/cgi/session.rb: ignore session_id options fixed.[Bug #605]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@22465 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
shyouhei 2009-02-20 10:35:11 +00:00
parent 4d17c7336b
commit bffc180590
3 changed files with 9 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,3 +1,7 @@
Fri Feb 20 19:35:08 2009 Takeyuki FUJIOKA <xibbar@ruby-lang.org>
* lib/cgi/session.rb: ignore session_id options fixed.[Bug #605]
Fri Feb 20 18:06:40 2009 James Edward Gray II <jeg2@ruby-lang.org>
Merged 20854 from trunk.

6
lib/cgi/session.rb
View file

@ -188,7 +188,6 @@ class CGI
md5.update('foobar')
session_id = md5.hexdigest
end
@new_session = true
session_id
end
private :create_new_id
@ -256,6 +255,7 @@ class CGI
unless session_id
if option['new_session']
session_id = create_new_id
@new_session = true
end
end
unless session_id
@ -271,6 +271,7 @@ class CGI
raise ArgumentError, "session_key `%s' should be supplied"%session_key
end
session_id = create_new_id
@new_session = true
end
end
@session_id = session_id
@ -281,7 +282,8 @@ class CGI
unless option.fetch('new_session', true)
raise ArgumentError, "invalid session_id `%s'"%session_id
end
session_id = @session_id = create_new_id
session_id = @session_id = create_new_id unless session_id
@new_session = true
retry
end
request.instance_eval do

2
version.h
View file

@ -2,7 +2,7 @@
#define RUBY_RELEASE_DATE "2009-02-20"
#define RUBY_VERSION_CODE 187
#define RUBY_RELEASE_CODE 20090220
#define RUBY_PATCHLEVEL 132
#define RUBY_PATCHLEVEL 133
#define RUBY_VERSION_MAJOR 1
#define RUBY_VERSION_MINOR 8