From 66fb6bf597dd7763ca6d3ea890c5bb462c365102 Mon Sep 17 00:00:00 2001 From: yugui Date: Fri, 19 Dec 2008 11:37:50 +0000 Subject: merges r20861 from trunk into ruby_1_9_1. * lib/cgi/session.rb: fix bug for ignore session_id option. report from [ruby-core:18635], [Bug #572] * lib/cgi/core.rb: use Encoding#find when encoding set. * test/cgi/test_cgi_session.rb: test for session_id specified. git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@20881 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- lib/cgi/core.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/cgi/core.rb') diff --git a/lib/cgi/core.rb b/lib/cgi/core.rb index 87c4f6854..779f326a1 100644 --- a/lib/cgi/core.rb +++ b/lib/cgi/core.rb @@ -590,7 +590,7 @@ class CGI read_from_cmdline end.dup.force_encoding(@accept_charset) ) - unless @accept_charset=~/ASCII-8BIT/i || @accept_charset==Encoding::ASCII_8BIT + unless Encoding.find(@accept_charset) == Encoding::ASCII_8BIT @params.each do |key,values| values.each do |value| unless value.valid_encoding? -- cgit