merges r20154-20158, r20161 from trunk into ruby_1_9_1.

* lib/cgi/session/pstore.rb: fix indentation.
    * lib/cgi/session.rb (FileStore): use marshalized data.
    * test/cgi/session_dir: add a session directory in test.
    * test/cgi/test_cgi_session.rb: add a test.
    * test/cgi/test_cgi_multipart.rb: 1.9 support.
    * test/cgi/test_cgi_session.rb: ditto.
    * test/cgi/test_cgi_tag_helper.rb: ditto.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@20200 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
yugui 2008-11-11 11:01:41 +00:00
parent b3952151a1
commit 90c250920b
6 changed files with 213 additions and 91 deletions

View file

@ -135,7 +135,11 @@ class CGIMultipartTest < Test::Unit::TestCase
ENV['CONTENT_LENGTH'] = input.length.to_s
ENV['REQUEST_METHOD'] = 'POST'
## set $stdin
tmpfile = Tempfile.new(self.name, :binmode => true)
tmpfile = if RUBY_VERSION >="1.9"
Tempfile.new(self.name, :binmode => true)
else
Tempfile.new(self.name)
end
tmpfile << input
tmpfile.rewind()
$stdin = tmpfile