aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-03-12 08:48:10 +0000
committernaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-03-12 08:48:10 +0000
commitd7cc39658cd7b92b9bac8e5131cae4d79577e82c (patch)
tree6dc769245ae7919debb97dce1da6ca5bab6201b3
parentda72b1bb6e323dcc288541af1a9516027d40c905 (diff)
downloadruby-d7cc39658cd7b92b9bac8e5131cae4d79577e82c.tar.gz
* lib/webrick/httpservlet/cgihandler.rb
(WEBrick::HTTPServlet::CGIHandler#do_GET): set binary mode for tempfile. http://pc12.2ch.net/test/read.cgi/tech/1265467681/286 git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@26887 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog7
-rw-r--r--lib/webrick/httpservlet/cgihandler.rb4
2 files changed, 9 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 590c9248c5..4004c0c5e4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Fri Mar 12 17:36:35 2010 NARUSE, Yui <naruse@ruby-lang.org>
+
+ * lib/webrick/httpservlet/cgihandler.rb
+ (WEBrick::HTTPServlet::CGIHandler#do_GET):
+ set binary mode for tempfile.
+ http://pc12.2ch.net/test/read.cgi/tech/1265467681/286
+
Fri Mar 12 13:52:00 2010 Kenta Murata <mrkn@mrkn.jp>
* tool/compile_prelude.rb: TMP_RUBY_PREFIX should replace
diff --git a/lib/webrick/httpservlet/cgihandler.rb b/lib/webrick/httpservlet/cgihandler.rb
index 7ba2d50860..1976ae6948 100644
--- a/lib/webrick/httpservlet/cgihandler.rb
+++ b/lib/webrick/httpservlet/cgihandler.rb
@@ -32,9 +32,9 @@ module WEBrick
status = -1
cgi_in = IO::popen(@cgicmd, "wb")
- cgi_out = Tempfile.new("webrick.cgiout.", @tempdir)
+ cgi_out = Tempfile.new("webrick.cgiout.", @tempdir, mode: IO::BINARY)
cgi_out.set_encoding("ASCII-8BIT")
- cgi_err = Tempfile.new("webrick.cgierr.", @tempdir)
+ cgi_err = Tempfile.new("webrick.cgierr.", @tempdir, mode: IO::BINARY)
cgi_err.set_encoding("ASCII-8BIT")
begin
cgi_in.sync = true