reweave/weave
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #2128 from weaveworks/issues/2109-skip-empty-json

Browse Source 
Don't attempt to parse JSON payload if it is 0 bytes long.

Fixes #2109.
This commit is contained in:
Matthias Radestock committed 2016-04-05 17:24:37 +01:00
2 parents 53ba2f0aff 66c92fe075
commit 28e0b14220
2 files changed
+6 -1
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

test/666_abuse_of_start_test.sh
+5
View File
@@ -33,6 +33,11 @@ proxy docker_on $HOST1 create --name=c4 --memory-swap -1 $SMALL_IMAGE echo foo
assert_raises "proxy docker_api_on $HOST1 POST /containers/c4/start 'null'"
assert "docker_on $HOST1 inspect -f '{{.HostConfig.MemorySwap}}' c4" "-1"
# Start c4b with an empty HostConfig (generated by Docker 1.11.0-rc2)
proxy docker_on $HOST1 create --name=c4b --memory-swap -1 $SMALL_IMAGE echo foo
assert_raises "proxy docker_api_on $HOST1 POST /containers/c4b/start ''"
assert "docker_on $HOST1 inspect -f '{{.HostConfig.MemorySwap}}' c4b" "-1"
# Start c6 with both named and unnamed HostConfig
proxy docker_on $HOST1 create --name=c6 $SMALL_IMAGE $CHECK_ETHWE_UP
proxy docker_api_on $HOST1 POST /containers/c6/start '{"NetworkMode": "container:c2", "HostConfig": {"NetworkMode": "container:c1"}}'