Fix error getting HTTP version in getRequestVersion

BBVA · Sep 10, 2020 · 66b227e · 66b227e
1 parent 99871de
commit 66b227e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/internal/server/data/resource.go b/internal/server/data/resource.go
@@ -59,7 +59,7 @@ func getRequestHost(w http.ResponseWriter, r *http.Request, h *model.Handler) {
 
 func getRequestVersion(w http.ResponseWriter, r *http.Request, h *model.Handler) {
 	w.Header().Add("Content-Type", "application/octet-stream")
-	_, _ = w.Write([]byte(r.Proto))
+	_, _ = w.Write([]byte(h.Request.Proto))
 }
 
 func getRequestPath(w http.ResponseWriter, r *http.Request, h *model.Handler) {

diff --git a/internal/server/data/resource_test.go b/internal/server/data/resource_test.go
@@ -275,14 +275,17 @@ func TestGetRequestVersionReturnsTheCorrectHttpVersion(t *testing.T) {
 		Request: httptest.NewRequest("POST", "http://www.foo.bar:8080/", nil),
 		Writer:  httptest.NewRecorder(),
 	}
+	h.Request.Proto = "HTTP/1.0"
+	h.Request.ProtoMajor = 1
+	h.Request.ProtoMinor = 0
 	r := httptest.NewRequest("GET", "/not-important-here", nil)
 	w := httptest.NewRecorder()
 
 	getRequestVersion(w, r, &h)
 
 	res := w.Result()
-	if body, _ := ioutil.ReadAll(res.Body); string(body) != "HTTP/1.1" {
-		t.Errorf("Version mismatch. Expected %v, got %v", "HTTP/1.1", string(body))
+	if body, _ := ioutil.ReadAll(res.Body); string(body) != h.Request.Proto {
+		t.Errorf("Version mismatch. Expected %q, got %q", h.Request.Proto, string(body))
 	}
 }