summaryrefslogtreecommitdiff
path: root/lib/webrick
diff options
context:
space:
mode:
authormarcandre <marcandre@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-11-08 20:59:01 +0000
committermarcandre <marcandre@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-11-08 20:59:01 +0000
commitf3e35474078895e1d178e15cfbfc6743f9ffc62d (patch)
treea3fd49329f497133415a7ec11592b5c693459608 /lib/webrick
parentcceca83afe046b8c2b53eab6ab7c52faa1719b6d (diff)
* 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')
-rw-r--r--lib/webrick/cgi.rb2
-rw-r--r--lib/webrick/httpresponse.rb2
-rw-r--r--lib/webrick/httpservlet/cgi_runner.rb3
-rw-r--r--lib/webrick/httpservlet/erbhandler.rb4
-rw-r--r--lib/webrick/log.rb2
5 files changed, 6 insertions, 7 deletions
diff --git a/lib/webrick/cgi.rb b/lib/webrick/cgi.rb
index 7099d14689..806d050bc9 100644
--- a/lib/webrick/cgi.rb
+++ b/lib/webrick/cgi.rb
@@ -143,7 +143,7 @@ module WEBrick
setup_header
@header_part << CRLF
@header_part.rewind
- rescue Exception => ex
+ rescue Exception
raise CGIError, "invalid CGI environment"
end
end
diff --git a/lib/webrick/httpresponse.rb b/lib/webrick/httpresponse.rb
index 16bf15b6dd..0c292bed2d 100644
--- a/lib/webrick/httpresponse.rb
+++ b/lib/webrick/httpresponse.rb
@@ -280,7 +280,7 @@ module WEBrick
if @request_method == "HEAD"
# do nothing
elsif chunked?
- remain = body ? @body.bytesize : 0
+ body ? @body.bytesize : 0
while buf = @body[@sent_size, @buffer_size]
break if buf.empty?
data = ""
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
diff --git a/lib/webrick/log.rb b/lib/webrick/log.rb
index 0ffa12dd96..550f9f56d6 100644
--- a/lib/webrick/log.rb
+++ b/lib/webrick/log.rb
@@ -60,7 +60,7 @@ module WEBrick
private
def format(arg)
- str = if arg.is_a?(Exception)
+ if arg.is_a?(Exception)
"#{arg.class}: #{arg.message}\n\t" <<
arg.backtrace.join("\n\t") << "\n"
elsif arg.respond_to?(:to_str)