From b66ac6a80990d382a3859cd5ca8c53f038bdc1ff Mon Sep 17 00:00:00 2001
From: Jessica Frazelle <jess@docker.com>
Date: Thu, 9 Oct 2014 13:20:38 -0700
Subject: [PATCH] Revert "Fix line delimited JSON response"

This reverts commit d2f75a3040e72562ffa825d5c3efa7004af2640a.

Conflicts:
	integration-cli/docker_api_events_test.go

Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
---
 api/client/utils.go                       |  2 +-
 api/server/server.go                      |  2 -
 events/events.go                          |  5 --
 integration-cli/docker_api_events_test.go | 57 -----------------------
 4 files changed, 1 insertion(+), 65 deletions(-)
 delete mode 100644 integration-cli/docker_api_events_test.go

diff --git a/api/client/utils.go b/api/client/utils.go
index 7eb110b86e..c6967f3cf2 100644
--- a/api/client/utils.go
+++ b/api/client/utils.go
@@ -168,7 +168,7 @@ func (cli *DockerCli) streamHelper(method, path string, setRawTerminal bool, in
 	}
 
 	if api.MatchesContentType(resp.Header.Get("Content-Type"), "application/json") {
-		return utils.DisplayJSONMessagesStream(resp.Body, stdout, cli.terminalFd, cli.isTerminal)
+		return utils.DisplayJSONMessagesStream(resp.Body, stdout, cli.outFd, cli.isTerminalOut)
 	}
 	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 d5b0bb1b5b..897dd6142f 100644
--- a/api/server/server.go
+++ b/api/server/server.go
@@ -297,8 +297,6 @@ func getEvents(eng *engine.Engine, version version.Version, w http.ResponseWrite
 	}
 
 	var job = eng.Job("events")
-	// lineDelimited JSON events was added #7047
-	job.SetenvBool("lineDelim", version.GreaterThanOrEqualTo("1.15"))
 	streamJSON(job, w, true)
 	job.Setenv("since", r.Form.Get("since"))
 	job.Setenv("until", r.Form.Get("until"))
diff --git a/events/events.go b/events/events.go
index 7c32cdb22d..57a82cada0 100644
--- a/events/events.go
+++ b/events/events.go
@@ -101,11 +101,6 @@ func writeEvent(job *engine.Job, event *utils.JSONMessage) error {
 	// When sending an event JSON serialization errors are ignored, but all
 	// other errors lead to the eviction of the listener.
 	if b, err := json.Marshal(event); err == nil {
-
-		if job.GetenvBool("lineDelim") {
-			b = append(b, []byte("\r\n")...)
-		}
-
 		if _, err = job.Stdout.Write(b); err != nil {
 			return err
 		}
diff --git a/integration-cli/docker_api_events_test.go b/integration-cli/docker_api_events_test.go
deleted file mode 100644
index 9fa5b006e1..0000000000
--- a/integration-cli/docker_api_events_test.go
+++ /dev/null
@@ -1,57 +0,0 @@
-package main
-
-import (
-	"bufio"
-	"bytes"
-	"encoding/json"
-	"fmt"
-	"testing"
-	"time"
-)
-
-func TestEventsApiGetLineDelim(t *testing.T) {
-	name := "testimageevents"
-	defer deleteImages(name)
-	_, err := buildImage(name,
-		`FROM scratch
-        MAINTAINER "docker"`,
-		true)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if err := deleteImages(name); err != nil {
-		t.Fatal(err)
-	}
-
-	endpoint := fmt.Sprintf("/events?since=1&until=%d", time.Now().Unix())
-	body, err := sockRequest("GET", endpoint)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	linesRead := 0
-	scanner := bufio.NewScanner(bytes.NewReader(body))
-	for scanner.Scan() && linesRead < 2 {
-		line := scanner.Bytes()
-		if len(line) == 0 {
-			continue
-		}
-
-		// make sure line delimited json
-		res := make(map[string]interface{})
-		if err := json.Unmarshal(line, &res); err != nil {
-			t.Fatalf("Unmarshaling the line as JSON failed: %v", err)
-		}
-
-		linesRead++
-	}
-	if err := scanner.Err(); err != nil {
-		t.Fatalf("Scanner failed: %v", err)
-	}
-
-	if linesRead < 2 {
-		t.Fatalf("Only %d lines were read from the stream", linesRead)
-	}
-
-	logDone("events - test the api response is line delimited json")
-}