kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases 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
commit 42ec80bec0
5 changed files with 15 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
api/client/utils.go
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 {

5
api/server/server.go
View file

@ -102,6 +102,10 @@ func writeJSON(w http.ResponseWriter, code int, v engine.Env) error {
func streamJSON(job *engine.Job, w http.ResponseWriter, flush bool) {
w.Header().Set("Content-Type", "application/json")
if job.GetenvBool("lineDelim") {
w.Header().Set("Content-Type", "application/x-json-stream")
}
if flush {
job.Stdout.Add(utils.NewWriteFlusher(w))
} else {
@ -976,6 +980,7 @@ func postBuild(eng *engine.Engine, version version.Version, w http.ResponseWrite
job.Setenv("q", r.FormValue("q"))
job.Setenv("nocache", r.FormValue("nocache"))
job.Setenv("forcerm", r.FormValue("forcerm"))
job.SetenvBool("lineDelim", version.GreaterThanOrEqualTo("1.15"))
job.SetenvJson("authConfig", authConfig)
job.SetenvJson("configFile", configFile)

2
api/server/server_unit_test.go
View file

@ -275,7 +275,7 @@ func TestGetEvents(t *testing.T) {
if !called {
t.Fatal("handler was not called")
}
assertContentType(r, "application/json", t)
assertContentType(r, "application/x-json-stream", t)
var stdout_json struct {
Since int
Until int

6
docs/sources/reference/api/docker_remote_api.md
View file

@ -37,6 +37,12 @@ You can still call an old version of the API using
### What's new
`POST /build`
`GET /events`
**New!**
Now has header: `Content-Type: application/x-json-stream`.
## v1.14
### Full Documentation

4
docs/sources/reference/api/docker_remote_api_v1.15.md
View file

@ -1052,7 +1052,7 @@ Build an image from Dockerfile via stdin
**Example response**:
HTTP/1.1 200 OK
Content-Type: application/json
Content-Type: application/x-json-stream
{"stream":"Step 1..."}
{"stream":"..."}
@ -1279,7 +1279,7 @@ via polling (using since)
**Example response**:
HTTP/1.1 200 OK
Content-Type: application/json
Content-Type: application/x-json-stream
{"status":"create","id":"dfdf82bd3881","from":"base:latest","time":1374067924}
{"status":"start","id":"dfdf82bd3881","from":"base:latest","time":1374067924}