From 273da85e85c776a8c1919c59c16f072e7af30b75 Mon Sep 17 00:00:00 2001
From: Armon Dadgar <armon.dadgar@gmail.com>
Date: Sun, 19 Apr 2015 14:36:50 -0700
Subject: [PATCH] http: pass raw request through

---
 http/handler.go    | 4 ++--
 http/logical.go    | 2 +-
 http/sys_lease.go  | 2 +-
 http/sys_policy.go | 8 ++++----
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/http/handler.go b/http/handler.go
index 1951ba5b2d..6bbbe20e80 100644
--- a/http/handler.go
+++ b/http/handler.go
@@ -63,10 +63,10 @@ func parseRequest(r *http.Request, out interface{}) error {
 
 // request is a helper to perform a request and properly exit in the
 // case of an error.
-func request(core *vault.Core, w http.ResponseWriter, reqURL *url.URL, r *logical.Request) (*logical.Response, bool) {
+func request(core *vault.Core, w http.ResponseWriter, rawReq *http.Request, r *logical.Request) (*logical.Response, bool) {
 	resp, err := core.HandleRequest(r)
 	if err == vault.ErrStandby {
-		respondStandby(core, w, reqURL)
+		respondStandby(core, w, rawReq.URL)
 		return resp, false
 	}
 	if respondCommon(w, resp) {
diff --git a/http/logical.go b/http/logical.go
index 52e04c3f8f..c7904a9129 100644
--- a/http/logical.go
+++ b/http/logical.go
@@ -56,7 +56,7 @@ func handleLogical(core *vault.Core) http.Handler {
 		// Make the internal request. We attach the connection info
 		// as well in case this is an authentication request that requires
 		// it. Vault core handles stripping this if we need to.
-		resp, ok := request(core, w, r.URL, requestAuth(r, &logical.Request{
+		resp, ok := request(core, w, r, requestAuth(r, &logical.Request{
 			Operation: op,
 			Path:      path,
 			Data:      req,
diff --git a/http/sys_lease.go b/http/sys_lease.go
index 216ccd342c..19ddccb03b 100644
--- a/http/sys_lease.go
+++ b/http/sys_lease.go
@@ -37,7 +37,7 @@ func handleSysRenew(core *vault.Core) http.Handler {
 			}
 		}
 
-		resp, ok := request(core, w, r.URL, requestAuth(r, &logical.Request{
+		resp, ok := request(core, w, r, requestAuth(r, &logical.Request{
 			Operation: logical.WriteOperation,
 			Path:      "sys/renew/" + path,
 			Data: map[string]interface{}{
diff --git a/http/sys_policy.go b/http/sys_policy.go
index 8da5e8fe1e..db010e0a59 100644
--- a/http/sys_policy.go
+++ b/http/sys_policy.go
@@ -15,7 +15,7 @@ func handleSysListPolicies(core *vault.Core) http.Handler {
 			return
 		}
 
-		resp, ok := request(core, w, r.URL, requestAuth(r, &logical.Request{
+		resp, ok := request(core, w, r, requestAuth(r, &logical.Request{
 			Operation: logical.ReadOperation,
 			Path:      "sys/policy",
 		}))
@@ -64,7 +64,7 @@ func handleSysDeletePolicy(core *vault.Core, w http.ResponseWriter, r *http.Requ
 		return
 	}
 
-	_, ok := request(core, w, r.URL, requestAuth(r, &logical.Request{
+	_, ok := request(core, w, r, requestAuth(r, &logical.Request{
 		Operation: logical.DeleteOperation,
 		Path:      "sys/policy/" + path,
 	}))
@@ -88,7 +88,7 @@ func handleSysReadPolicy(core *vault.Core, w http.ResponseWriter, r *http.Reques
 		return
 	}
 
-	resp, ok := request(core, w, r.URL, requestAuth(r, &logical.Request{
+	resp, ok := request(core, w, r, requestAuth(r, &logical.Request{
 		Operation: logical.ReadOperation,
 		Path:      "sys/policy/" + path,
 	}))
@@ -119,7 +119,7 @@ func handleSysWritePolicy(core *vault.Core, w http.ResponseWriter, r *http.Reque
 		return
 	}
 
-	_, ok := request(core, w, r.URL, requestAuth(r, &logical.Request{
+	_, ok := request(core, w, r, requestAuth(r, &logical.Request{
 		Operation: logical.WriteOperation,
 		Path:      "sys/policy/" + path,
 		Data: map[string]interface{}{