diff options
Diffstat (limited to 'lib/webrick/httpservlet')
| -rw-r--r-- | lib/webrick/httpservlet/cgi_runner.rb | 3 | ||||
| -rw-r--r-- | lib/webrick/httpservlet/erbhandler.rb | 4 |
2 files changed, 3 insertions, 4 deletions
diff --git a/lib/webrick/httpservlet/cgi_runner.rb b/lib/webrick/httpservlet/cgi_runner.rb index dd7325d25c..32ecb6fe00 100644 --- a/lib/webrick/httpservlet/cgi_runner.rb +++ b/lib/webrick/httpservlet/cgi_runner.rb @@ -20,7 +20,6 @@ end STDIN.binmode -buf = "" len = sysread(STDIN, 8).to_i out = sysread(STDIN, len) STDOUT.reopen(open(out, "w")) @@ -38,7 +37,7 @@ hash.each{|k, v| ENV[k] = v if v } dir = File::dirname(ENV["SCRIPT_FILENAME"]) Dir::chdir dir -if interpreter = ARGV[0] +if ARGV[0] argv = ARGV.dup argv << ENV["SCRIPT_FILENAME"] exec(*argv) diff --git a/lib/webrick/httpservlet/erbhandler.rb b/lib/webrick/httpservlet/erbhandler.rb index 845db07169..cbd4fb2303 100644 --- a/lib/webrick/httpservlet/erbhandler.rb +++ b/lib/webrick/httpservlet/erbhandler.rb @@ -44,8 +44,8 @@ module WEBrick private def evaluate(erb, servlet_request, servlet_response) Module.new.module_eval{ - meta_vars = servlet_request.meta_vars - query = servlet_request.query + servlet_request.meta_vars + servlet_request.query erb.result(binding) } end |