Skip to content

Commit 70aaa4f

Browse files
committed
feat(serverHandler): change custom header behavior
- use header.Set() instead of header.Add() - apply CORS headers before custom headers, so later one can overrides
1 parent 488ae7b commit 70aaa4f

File tree

3 files changed

+3
-6
lines changed

3 files changed

+3
-6
lines changed

src/serverHandler/aliasHandler.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -137,12 +137,12 @@ func (h *aliasHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
137137
return
138138
}
139139

140-
header(w, data.Headers)
141-
142140
if data.CanCors {
143141
cors(w)
144142
}
145143

144+
header(w, data.Headers)
145+
146146
if data.IsMutate {
147147
h.mutate(w, r, data)
148148
return

src/serverHandler/header.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,6 @@ func (h *aliasHandler) getHeaders(reqUrlPath, reqFsPath string, doGetHeaders boo
6464
func header(w http.ResponseWriter, headers [][2]string) {
6565
header := w.Header()
6666
for i := range headers {
67-
header.Add(headers[i][0], headers[i][1])
67+
header.Set(headers[i][0], headers[i][1])
6868
}
6969
}

test/case/032.custom.header.bash

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,6 @@ sleep 0.05 # wait server ready
1919
(curl_get_header http://127.0.0.1:3003/file1.txt | grep -q -i 'foo:\s*bar') ||
2020
fail "Custom header 'foo:bar' should exists"
2121

22-
(curl_get_header http://127.0.0.1:3003/ | grep -q -i 'set-cookie:\s*name1=value1') ||
23-
fail "Custom header 'set-cookie:name1=value1' should exists"
24-
2522
(curl_get_header http://127.0.0.1:3003/ | grep -q -i 'set-cookie:\s*name2=value2') ||
2623
fail "Custom header 'set-cookie:name2=value2' should exists"
2724

0 commit comments

Comments
 (0)