erabo/spiegel_podman
1
0
Fork 0
mirror of https://github.com/podman-container-tools/podman.git synced 2026-10-12 08:57:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Merge pull request #7089 from vrothberg/2.0-fix-7078

Browse source 
[2.0] events parsing fix #7078
This commit is contained in:
OpenShift Merge Robot 2020-07-27 19:02:34 +02:00 • committed by GitHub
commit eea6bd1cf4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 1 deletions
Show stats 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
filters map[string][]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.
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"
fi
# Simple events test (see #7078)
t GET "events?stream=false" 200
t GET "libpod/events?stream=false" 200
# vim: filetype=sh