Merge branch '1.4'

This commit is contained in:
Matthias Radestock committed 2016-04-05 17:26:01 +01:00
commit 3e07f03c87
2 files changed
+6 -1

No files matched your search

+1 -1
View File
@@ -15,7 +15,7 @@ func (i *startContainerInterceptor) InterceptRequest(r *http.Request) error {
// If the client has sent some JSON which might be a HostConfig, add our
// parameters back into it, otherwise Docker will consider them overwritten
if containerShouldAttach(container) && r.Header.Get("Content-Type") == "application/json" {
if containerShouldAttach(container) && r.Header.Get("Content-Type") == "application/json" && r.ContentLength > 0 {
params := map[string]interface{}{}
if err := unmarshalRequestBody(r, &params); err != nil {
return err