From 12278f0b70e2a395817653e8b40dbcef0f94bed6 Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sun, 17 Jan 2010 05:31:52 +0000
Subject: * lib/webrick/https.rb (parse_uri, meta_vars): suppress warnings.

* lib/webrick/ssl.rb (listen): ditto.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@26334 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 lib/webrick/https.rb | 4 ++--
 lib/webrick/ssl.rb   | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

(limited to 'lib/webrick')

diff --git a/lib/webrick/https.rb b/lib/webrick/https.rb
index 81b65ce803..dd9d178618 100644
--- a/lib/webrick/https.rb
+++ b/lib/webrick/https.rb
@@ -33,7 +33,7 @@ module WEBrick
     alias orig_parse_uri parse_uri
 
     def parse_uri(str, scheme="https")
-      if @server_cert
+      if server_cert
         return orig_parse_uri(str, scheme)
       end
       return orig_parse_uri(str)
@@ -43,7 +43,7 @@ module WEBrick
 
     def meta_vars
       meta = orig_meta_vars
-      if @server_cert
+      if server_cert
         meta["HTTPS"] = "on"
         meta["SSL_SERVER_CERT"] = @server_cert.to_pem
         meta["SSL_CLIENT_CERT"] = @client_cert ? @client_cert.to_pem : ""
diff --git a/lib/webrick/ssl.rb b/lib/webrick/ssl.rb
index 896206b483..ff73ad1b8b 100644
--- a/lib/webrick/ssl.rb
+++ b/lib/webrick/ssl.rb
@@ -83,6 +83,7 @@ module WEBrick
       @ssl_context ||= nil
     end
 
+    undef listen
     def listen(address, port)
       listeners = Utils::create_listeners(address, port, @logger)
       if @config[:SSLEnable]
-- 
cgit v1.2.3