faas-rs/faas
1
0
Fork 0
mirror of https://github.com/openfaas/faas.git synced 2025-06-22 14:53:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Commit unit tests for content-type order

Browse Source 
Signed-off-by: Alex Ellis <alexellis2@gmail.com>
This commit is contained in:
Alex Ellis
2017-10-20 19:01:45 +02:00
parent 4d4a09fa19
commit 520a6b05a1
2 changed files with 64 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
gateway/handlers/proxy.go
View File

@ -168,25 +168,31 @@ func invokeService(w http.ResponseWriter, r *http.Request, metrics metrics.Metri
clientHeader := w.Header()
copyHeaders(&clientHeader, &response.Header)
responseHeader := response.Header.Get("Content-Type")
requestHeader := r.Header.Get("Content-Type")
defaultHeader := "text/plain"
contentTypeField := "Content-Type"
fmt.Printf("Req %s Res %s\n", requestHeader, responseHeader)
if len(responseHeader) > 0 {
w.Header().Set(contentTypeField, responseHeader)
} else if len(requestHeader) > 0 {
w.Header().Set(contentTypeField, requestHeader)
} else {
w.Header().Set(contentTypeField, defaultHeader)
}
w.Header().Set("Content-Type", GetContentType(response.Header, r.Header, defaultHeader))
writeHead(service, metrics, response.StatusCode, w)
w.Write(responseBody)
}
// GetContentType resolves the correct Content-Tyoe for a proxied function
func GetContentType(request http.Header, proxyResponse http.Header, defaultValue string) string {
responseHeader := proxyResponse.Get("Content-Type")
requestHeader := request.Get("Content-Type")
var headerContentType string
if len(responseHeader) > 0 {
headerContentType = responseHeader
} else if len(requestHeader) > 0 {
headerContentType = requestHeader
} else {
headerContentType = defaultValue
}
return headerContentType
}
func copyHeaders(destination *http.Header, source *http.Header) {
for k, vv := range *source {
vvClone := make([]string, len(vv))