clearlinux/docker
2
0
Fork 0
mirror of https://github.com/clearlinux/docker.git synced 2026-09-08 06:51:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8101 from jfrazelle/6974-correct-ct-json-stream

Browse Source 
Change content-type for json stream to application/x-json-stream.
This commit is contained in:
Victor Vieux
2014-09-23 11:24:31 -07:00
parent e3f1f0d354 10ab2089ce
commit 42ec80bec0
5 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
api/client/utils.go
+1 -1
View File
@@ -167,7 +167,7 @@ func (cli *DockerCli) streamHelper(method, path string, setRawTerminal bool, in
return fmt.Errorf("Error: %s", bytes.TrimSpace(body))
}
if api.MatchesContentType(resp.Header.Get("Content-Type"), "application/json") {
if api.MatchesContentType(resp.Header.Get("Content-Type"), "application/json") || api.MatchesContentType(resp.Header.Get("Content-Type"), "application/x-json-stream") {
return utils.DisplayJSONMessagesStream(resp.Body, stdout, cli.terminalFd, cli.isTerminal)
}
if stdout != nil || stderr != nil {