[前][次][番号順一覧][スレッド一覧]

ruby-changes:14497

From: nobu <ko1@a...>
Date: Sun, 17 Jan 2010 14:32:03 +0900 (JST)
Subject: [ruby-changes:14497] Ruby:r26334 (trunk): * lib/webrick/https.rb (parse_uri, meta_vars): suppress warnings.

nobu	2010-01-17 14:31:52 +0900 (Sun, 17 Jan 2010)

  New Revision: 26334

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=26334

  Log:
    * lib/webrick/https.rb (parse_uri, meta_vars): suppress warnings.
    
    * lib/webrick/ssl.rb (listen): ditto.

  Modified files:
    trunk/lib/webrick/https.rb
    trunk/lib/webrick/ssl.rb

Index: lib/webrick/ssl.rb
===================================================================
--- lib/webrick/ssl.rb	(revision 26333)
+++ lib/webrick/ssl.rb	(revision 26334)
@@ -83,6 +83,7 @@
       @ssl_context ||= nil
     end
 
+    undef listen
     def listen(address, port)
       listeners = Utils::create_listeners(address, port, @logger)
       if @config[:SSLEnable]
Index: lib/webrick/https.rb
===================================================================
--- lib/webrick/https.rb	(revision 26333)
+++ lib/webrick/https.rb	(revision 26334)
@@ -33,7 +33,7 @@
     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 @@
 
     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 : ""

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]