Dark-Alex-17/kapow
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix error getting HTTP version in getRequestVersion

Browse Source
This commit is contained in:
Héctor Hurtado
2020-09-10 12:30:58 +02:00
parent 99871de601
commit 66b227e67b
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/server/data/resource.go
+1 -1
View File
@@ -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) { func getRequestVersion(w http.ResponseWriter, r *http.Request, h *model.Handler) {
w.Header().Add("Content-Type", "application/octet-stream") 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) { func getRequestPath(w http.ResponseWriter, r *http.Request, h *model.Handler) {
internal/server/data/resource_test.go
+5 -2
View File
@@ -275,14 +275,17 @@ func TestGetRequestVersionReturnsTheCorrectHttpVersion(t *testing.T) {
Request: httptest.NewRequest("POST", "http://www.foo.bar:8080/", nil), Request: httptest.NewRequest("POST", "http://www.foo.bar:8080/", nil),
Writer: httptest.NewRecorder(), 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) r := httptest.NewRequest("GET", "/not-important-here", nil)
w := httptest.NewRecorder() w := httptest.NewRecorder()
getRequestVersion(w, r, &h) getRequestVersion(w, r, &h)
res := w.Result() res := w.Result()
if body, _ := ioutil.ReadAll(res.Body); string(body) != "HTTP/1.1" { if body, _ := ioutil.ReadAll(res.Body); string(body) != h.Request.Proto {
t.Errorf("Version mismatch. Expected %v, got %v", "HTTP/1.1", string(body)) t.Errorf("Version mismatch. Expected %q, got %q", h.Request.Proto, string(body))
} }
} }