diff options
| author | marcandre <marcandre@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-11-08 20:59:01 +0000 |
|---|---|---|
| committer | marcandre <marcandre@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-11-08 20:59:01 +0000 |
| commit | f3e35474078895e1d178e15cfbfc6743f9ffc62d (patch) | |
| tree | a3fd49329f497133415a7ec11592b5c693459608 /lib/webrick/httpservlet | |
| parent | cceca83afe046b8c2b53eab6ab7c52faa1719b6d (diff) | |
| download | ruby-f3e35474078895e1d178e15cfbfc6743f9ffc62d.tar.gz | |
* lib/*.rb: Remove unused variable warnings.
Patch by Run Paint [ruby-core:30991]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@29726 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
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 |