opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-07-29 19:33:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7730 from jwhonce/wip/headers

Browse Source 
Add Server header to API service responses
This commit is contained in:
OpenShift Merge Robot
2020-09-22 18:41:01 +00:00
committed by GitHub
parent 961a3d03c8 23bd99623e
commit a7c7cd21e4
1 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
pkg/api/server/handler_api.go
View File

@ -34,15 +34,18 @@ func (s *APIServer) APIHandler(h http.HandlerFunc) http.HandlerFunc {
} }
// TODO: Use r.ConnContext when ported to go 1.13 // TODO: Use r.ConnContext when ported to go 1.13
c := context.WithValue(r.Context(), "decoder", s.Decoder) //nolint c := context.WithValue(r.Context(), "decoder", s.Decoder) // nolint
c = context.WithValue(c, "runtime", s.Runtime) //nolint c = context.WithValue(c, "runtime", s.Runtime) // nolint
c = context.WithValue(c, "shutdownFunc", s.Shutdown) //nolint c = context.WithValue(c, "shutdownFunc", s.Shutdown) // nolint
c = context.WithValue(c, "idletracker", s.idleTracker) //nolint c = context.WithValue(c, "idletracker", s.idleTracker) // nolint
r = r.WithContext(c) r = r.WithContext(c)
v := utils.APIVersion[utils.CompatTree][utils.CurrentAPIVersion] cv := utils.APIVersion[utils.CompatTree][utils.CurrentAPIVersion]
w.Header().Set("API-Version", fmt.Sprintf("%d.%d", v.Major, v.Minor)) w.Header().Set("API-Version", fmt.Sprintf("%d.%d", cv.Major, cv.Minor))
w.Header().Set("Libpod-API-Version", utils.APIVersion[utils.LibpodTree][utils.CurrentAPIVersion].String())
lv := utils.APIVersion[utils.LibpodTree][utils.CurrentAPIVersion].String()
w.Header().Set("Libpod-API-Version", lv)
w.Header().Set("Server", "Libpod/"+lv+" ("+runtime.GOOS+")")
h(w, r) h(w, r)
} }