Fix #4689: Use SSLEnable instead of EnableSSL and make URL HTTPS.

lib/jekyll/commands/serve.rb

@@ -116,11 +116,12 @@ module Jekyll
 
         private
         def server_address(server, opts)
-          address = server.config[:BindAddress]
+          "%{prefix}://%{address}:%{port}%{baseurl}" % {
-          baseurl = "#{opts["baseurl"]}/" if opts["baseurl"]
+            :prefix => server.config[:SSLEnable] ? "https" : "http",
-          port = server.config[:Port]
+            :baseurl => opts["baseurl"] ? "#{opts["baseurl"]}/" : "",
-
+            :address => server.config[:BindAddress],
-          "http://#{address}:#{port}#{baseurl}"
+            :port => server.config[:Port]
+          }
         end
 
         #
@@ -182,7 +183,7 @@ module Jekyll
           source_certificate = Jekyll.sanitized_path(opts[:JekyllOptions]["source"], opts[:JekyllOptions]["ssl_cert"])
           opts[:SSLCertificate] = OpenSSL::X509::Certificate.new(File.read(source_certificate))
           opts[:SSLPrivateKey ] = OpenSSL::PKey::RSA.new(File.read(source_key))
-          opts[:EnableSSL] = true
+          opts[:SSLEnable] = true
         end
 
         private

test/test_commands_serve.rb

@@ -110,7 +110,7 @@ class TestCommandsServe < JekyllUnitTest
             "ssl_key" => "bar"
           })
 
-          assert result[:EnableSSL]
+          assert result[:SSLEnable]
           assert_equal result[:SSLPrivateKey ], "c2"
           assert_equal result[:SSLCertificate], "c1"
         end