Mailing-List: contact commits-help@couchdb.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@couchdb.apache.org
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r821071 -
 /couchdb/branches/0.10.x/src/couchdb/couch_httpd.erl
Date: Fri, 02 Oct 2009 16:00:29 -0000
To: commits@couchdb.apache.org
From: jasondavies@apache.org
Message-Id: <20091002160029.231DF23889C7@eris.apache.org>

Author: jasondavies
Date: Fri Oct  2 16:00:28 2009
New Revision: 821071

URL: http://svn.apache.org/viewvc?rev=821071&view=rev
Log:
Merged fix from trunk: OAuth support for "https" URL scheme when using SSL proxy.

Modified:
    couchdb/branches/0.10.x/src/couchdb/couch_httpd.erl

Modified: couchdb/branches/0.10.x/src/couchdb/couch_httpd.erl
URL: http://svn.apache.org/viewvc/couchdb/branches/0.10.x/src/couchdb/couch_httpd.erl?rev=821071&r1=821070&r2=821071&view=diff
==============================================================================
--- couchdb/branches/0.10.x/src/couchdb/couch_httpd.erl (original)
+++ couchdb/branches/0.10.x/src/couchdb/couch_httpd.erl Fri Oct  2 16:00:28 2009
@@ -278,7 +278,18 @@
             end;
         Value -> Value
     end,
-    "http://" ++ Host ++ Path.
+    XSsl = couch_config:get("httpd", "x_forwarded_ssl", "X-Forwarded-Ssl"),
+    Scheme = case MochiReq:get_header_value(XSsl) of
+        "on" -> "https";
+        _ ->
+            XProto = couch_config:get("httpd", "x_forwarded_proto", "X-Forwarded-Proto"),
+            case MochiReq:get_header_value(XProto) of
+                % Restrict to "https" and "http" schemes only
+                "https" -> "https";
+                _ -> "http"
+            end
+    end,
+    Scheme ++ "://" ++ Host ++ Path.
 
 unquote(UrlEncodedString) ->
     mochiweb_util:unquote(UrlEncodedString).