From 4c6b7cd1b560c72f2c79c28f77644f05b3ee657e Mon Sep 17 00:00:00 2001 From: Jessica Frazelle Date: Thu, 9 Oct 2014 13:17:47 -0700 Subject: [PATCH] Revert "Change content-type for json stream to application/x-json-stream." This reverts commit 10ab2089ce189d5bea3f7aaac3b5081471309478. Conflicts: api/client/utils.go docs/sources/reference/api/docker_remote_api.md Docker-DCO-1.1-Signed-off-by: Jessica Frazelle (github: jfrazelle) --- api/client/utils.go | 4 ++-- api/server/server.go | 7 ------- api/server/server_unit_test.go | 2 +- .../reference/api/docker_remote_api.md | 20 ++----------------- .../reference/api/docker_remote_api_v1.15.md | 4 ++-- 5 files changed, 7 insertions(+), 30 deletions(-) diff --git a/api/client/utils.go b/api/client/utils.go index 415046a5f8..7eb110b86e 100644 --- a/api/client/utils.go +++ b/api/client/utils.go @@ -167,8 +167,8 @@ 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") || api.MatchesContentType(resp.Header.Get("Content-Type"), "application/x-json-stream") { - return utils.DisplayJSONMessagesStream(resp.Body, stdout, cli.outFd, cli.isTerminalOut) + if api.MatchesContentType(resp.Header.Get("Content-Type"), "application/json") { + return utils.DisplayJSONMessagesStream(resp.Body, stdout, cli.terminalFd, cli.isTerminal) } if stdout != nil || stderr != nil { // When TTY is ON, use regular copy diff --git a/api/server/server.go b/api/server/server.go index 0a64c8fbf7..d5b0bb1b5b 100644 --- a/api/server/server.go +++ b/api/server/server.go @@ -120,10 +120,6 @@ 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 { @@ -993,9 +989,6 @@ func postBuild(eng *engine.Engine, version version.Version, w http.ResponseWrite } } - // This needs to be set before calls to streamJSON - job.SetenvBool("lineDelim", version.GreaterThanOrEqualTo("1.15")) - if version.GreaterThanOrEqualTo("1.8") { job.SetenvBool("json", true) streamJSON(job, w, true) diff --git a/api/server/server_unit_test.go b/api/server/server_unit_test.go index b433cc7683..519652f377 100644 --- a/api/server/server_unit_test.go +++ b/api/server/server_unit_test.go @@ -275,7 +275,7 @@ func TestGetEvents(t *testing.T) { if !called { t.Fatal("handler was not called") } - assertContentType(r, "application/x-json-stream", t) + assertContentType(r, "application/json", t) var stdout_json struct { Since int Until int diff --git a/docs/sources/reference/api/docker_remote_api.md b/docs/sources/reference/api/docker_remote_api.md index edd4089da6..1475f78256 100644 --- a/docs/sources/reference/api/docker_remote_api.md +++ b/docs/sources/reference/api/docker_remote_api.md @@ -41,22 +41,6 @@ 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`. - -`POST /containers/(id)/exec` - -**New!** -Setup an exec command in a running container `id`. - -`POST /exec/(id)/start` - -**New!** -Start an exec command. - ## v1.14 ### Full Documentation @@ -97,7 +81,7 @@ the `tag` parameter at the same time will return an error. The `HostConfig.Links` field is now filled correctly **New!** -`Sockets` parameter added to the `/info` endpoint listing all the sockets the +`Sockets` parameter added to the `/info` endpoint listing all the sockets the daemon is configured to listen on. `POST /containers/(name)/start` @@ -425,7 +409,7 @@ Builder (/build): intermediary buffers - Simpler, less memory usage, less disk usage and faster -> **Warning**: +> **Warning**: > The /build improvements are not reverse-compatible. Pre 1.3 clients will > break on /build. diff --git a/docs/sources/reference/api/docker_remote_api_v1.15.md b/docs/sources/reference/api/docker_remote_api_v1.15.md index 48ba5cc151..570b83d43a 100644 --- a/docs/sources/reference/api/docker_remote_api_v1.15.md +++ b/docs/sources/reference/api/docker_remote_api_v1.15.md @@ -1082,7 +1082,7 @@ Build an image from Dockerfile via stdin **Example response**: HTTP/1.1 200 OK - Content-Type: application/x-json-stream + Content-Type: application/json {"stream":"Step 1..."} {"stream":"..."} @@ -1317,7 +1317,7 @@ and Docker images will report: **Example response**: HTTP/1.1 200 OK - Content-Type: application/x-json-stream + Content-Type: application/json {"status":"create","id":"dfdf82bd3881","from":"base:latest","time":1374067924} {"status":"start","id":"dfdf82bd3881","from":"base:latest","time":1374067924}