From 18e18765805e6d4517914301142c6c6a27584e49 Mon Sep 17 00:00:00 2001 From: Victor Vieux Date: Fri, 2 May 2014 22:03:59 +0000 Subject: [PATCH] return write error Docker-DCO-1.1-Signed-off-by: Victor Vieux (github: vieux) Upstream-commit: c65de2c0207ac67e5023ada8709490ef4627bd01 Component: engine --- components/engine/api/server/server.go | 4 ++-- .../docs/sources/reference/api/docker_remote_api_v1.11.md | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/components/engine/api/server/server.go b/components/engine/api/server/server.go index 18c9a93d97..ab0f98fa47 100644 --- a/components/engine/api/server/server.go +++ b/components/engine/api/server/server.go @@ -978,8 +978,8 @@ func writeCorsHeaders(w http.ResponseWriter, r *http.Request) { } func ping(eng *engine.Engine, version version.Version, w http.ResponseWriter, r *http.Request, vars map[string]string) error { - w.Write([]byte{'O', 'K'}) - return nil + _, err := w.Write([]byte{'O', 'K'}) + return err } func makeHttpHandler(eng *engine.Engine, logging bool, localMethod string, localRoute string, handlerFunc HttpApiFunc, enableCors bool, dockerVersion version.Version) http.HandlerFunc { diff --git a/components/engine/docs/sources/reference/api/docker_remote_api_v1.11.md b/components/engine/docs/sources/reference/api/docker_remote_api_v1.11.md index 5ad174565d..53e07b380c 100644 --- a/components/engine/docs/sources/reference/api/docker_remote_api_v1.11.md +++ b/components/engine/docs/sources/reference/api/docker_remote_api_v1.11.md @@ -1181,6 +1181,7 @@ Ping the docker server Status Codes: - **200** - no error + - **500** - server error ### Create a new image from a container's changes