summary refs log tree commit
diff options
context:
space:
mode:
authorJoshua Peek <josh@joshpeek.com>2011-04-27 15:05:52 -0700
committerJoshua Peek <josh@joshpeek.com>2011-04-27 15:05:52 -0700
commitc0d7bc2dd05f45de7cb420ca9bf8a49873c1f9c5 (patch)
treea9a2ddfa1688da7833a2f4b888cc0f6d7397ea1c
parent4d93f90b58b09329a227fac975228eeef76f2952 (diff)
parentb70085a129d189560992b66e6662538d91c002e2 (diff)
downloadrack-c0d7bc2dd05f45de7cb420ca9bf8a49873c1f9c5.tar.gz
Merged pull request #126 from plentz/master.
mongrel rack.url_scheme was hardcoded to http
-rw-r--r--lib/rack/handler/mongrel.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/rack/handler/mongrel.rb b/lib/rack/handler/mongrel.rb
index e4372918..665a84a3 100644
--- a/lib/rack/handler/mongrel.rb
+++ b/lib/rack/handler/mongrel.rb
@@ -60,7 +60,7 @@ module Rack
                      "rack.multiprocess" => false, # ???
                      "rack.run_once" => false,
 
-                     "rack.url_scheme" => "http",
+                     "rack.url_scheme" => ["yes", "on", "1"].include?(env["HTTPS"]) ? "https" : "http"
                    })
         env["QUERY_STRING"] ||= ""