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

ruby-changes:67215

From: Kentaro <ko1@a...>
Date: Mon, 23 Aug 2021 09:59:34 +0900 (JST)
Subject: [ruby-changes:67215] f18e1752dc (master): Display httpd URLs supporting HTTPS

https://git.ruby-lang.org/ruby.git/commit/?id=f18e1752dc

From f18e1752dcc55d62d4153926b5659a83469eb5ff Mon Sep 17 00:00:00 2001
From: Kentaro Goto <gotoken@n...>
Date: Tue, 27 Apr 2021 14:49:37 +0900
Subject: Display httpd URLs supporting HTTPS

---
 lib/un.rb | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/lib/un.rb b/lib/un.rb
index e2ee755..e656a4a 100644
--- a/lib/un.rb
+++ b/lib/un.rb
@@ -347,13 +347,20 @@ def httpd https://github.com/ruby/ruby/blob/trunk/lib/un.rb#L347
     options[:Port] ||= 8080     # HTTP Alternate
     options[:DocumentRoot] = argv.shift || '.'
     s = nil
-    options[:StartCallback] = Proc.new do
+    options[:StartCallback] = proc {
       logger = s.logger
       logger.info("To access this server, open this file in a browser:")
       s.listeners.each do |listener|
-        logger.info("    http://#{listener.connect_address.inspect_sockaddr}")
+        if options[:SSLEnable]
+          addr = listener.addr
+          addr[3] = "127.0.0.1" if addr[3] == "0.0.0.0"
+          addr[3] = "::1" if addr[3] == "::"
+          logger.info("    https://#{Addrinfo.new(addr).inspect_sockaddr}")
+        else
+          logger.info("    http://#{listener.connect_address.inspect_sockaddr}")
+        end
       end
-    end
+    }
     s = WEBrick::HTTPServer.new(options)
     shut = proc {s.shutdown}
     siglist = %w"TERM QUIT"
-- 
cgit v1.1


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

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