From 6d1bc6c6ea79986a4d38ad588d632243d159ed79 Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Thu, 6 Oct 2016 09:48:37 -0700
Subject: [PATCH 1/2] Revert Commands::Serve#server_address signature change.

---
 lib/jekyll/commands/serve.rb | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/lib/jekyll/commands/serve.rb b/lib/jekyll/commands/serve.rb
index d8f5890c..d1b49f3d 100644
--- a/lib/jekyll/commands/serve.rb
+++ b/lib/jekyll/commands/serve.rb
@@ -104,12 +104,7 @@ module Jekyll
         def start_up_webrick(opts, destination)
           server = WEBrick::HTTPServer.new(webrick_opts(opts)).tap { |o| o.unmount("") }
           server.mount(opts["baseurl"], Servlet, destination, file_handler_opts)
-          Jekyll.logger.info "Server address:", server_address(
-            server.config[:SSLEnable],
-            server.config[:BindAddress],
-            server.config[:Port],
-            opts["baseurl"]
-          )
+          Jekyll.logger.info "Server address:", server_address(server, opts)
           launch_browser server, opts if opts["open_url"]
           boot_or_detach server, opts
         end
@@ -129,9 +124,19 @@ module Jekyll
         #
 
         private
-        def server_address(prefix, address, port, baseurl = nil)
+        def server_address(server, options = {})
+          format_url(
+            server.config[:SSLEnable],
+            server.config[:BindAddress],
+            server.config[:Port],
+            options["baseurl"],
+          )
+        end
+
+        private
+        def format_url(ssl_enabled, address, port, baseurl = nil)
           format("%{prefix}://%{address}:%{port}%{baseurl}", {
-            :prefix  => prefix ? "https" : "http",
+            :prefix  => ssl_enabled ? "https" : "http",
             :address => address,
             :port    => port,
             :baseurl => baseurl ? "#{baseurl}/" : ""
@@ -143,7 +148,7 @@ module Jekyll
         private
         def default_url(opts)
           config = configuration_from_options(opts)
-          server_address(
+          format_url(
             config["ssl_cert"] && config["ssl_key"],
             config["host"] == "127.0.0.1" ? "localhost" : config["host"],
             config["port"]

From ed042de6c4b989a72edc3216d46a975a372d6a17 Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Thu, 6 Oct 2016 10:15:45 -0700
Subject: [PATCH 2/2] Oh fine, rubocop.

---
 lib/jekyll/commands/serve.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/jekyll/commands/serve.rb b/lib/jekyll/commands/serve.rb
index d1b49f3d..e0da4807 100644
--- a/lib/jekyll/commands/serve.rb
+++ b/lib/jekyll/commands/serve.rb
@@ -129,7 +129,7 @@ module Jekyll
             server.config[:SSLEnable],
             server.config[:BindAddress],
             server.config[:Port],
-            options["baseurl"],
+            options["baseurl"]
           )
         end