opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-27 05:26:50 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7088 from vrothberg/fix-7078

Browse Source 
API events: fix parsing error
This commit is contained in:
OpenShift Merge Robot
2020-07-27 15:10:27 +02:00
committed by GitHub
parent 71f7150490 724a09e40e
commit 55a7faf2b8
2 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/api/handlers/compat/events.go
View File

@ -29,8 +29,14 @@ func filtersFromRequest(r *http.Request) ([]string, error) {
compatFilters map[string]map[string]bool compatFilters map[string]map[string]bool
filters map[string][]string filters map[string][]string
libpodFilters []string libpodFilters []string
raw []byte
) )
raw := []byte(r.Form.Get("filters"))
if _, found := r.URL.Query()["filters"]; found {
raw = []byte(r.Form.Get("filters"))
} else {
return []string{}, nil
}
// Backwards compat with older versions of Docker. // Backwards compat with older versions of Docker.
if err := json.Unmarshal(raw, &compatFilters); err == nil { if err := json.Unmarshal(raw, &compatFilters); err == nil {

4
test/apiv2/01-basic.at
View File

@ -68,4 +68,8 @@ else
_show_ok 0 "Time for ten /info requests" "<= 5 seconds" "$delta_t seconds" _show_ok 0 "Time for ten /info requests" "<= 5 seconds" "$delta_t seconds"
fi fi
# Simple events test (see #7078)
t GET "events?stream=false" 200
t GET "libpod/events?stream=false" 200
# vim: filetype=sh # vim: filetype=sh