GitList

@@ -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 {

docs/sources/reference/api/docker_remote_api_v1.11.md

History View file @ c65de2c

@@ -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

...	...	@@ -978,8 +978,8 @@ func writeCorsHeaders(w http.ResponseWriter, r *http.Request) {
978	978	}
979	979
980	980	func ping(eng engine.Engine, version version.Version, w http.ResponseWriter, r http.Request, vars map[string]string) error {
981		- w.Write([]byte{'O', 'K'})
982		- return nil
	981	+ _, err := w.Write([]byte{'O', 'K'})
	982	+ return err
983	983	}
984	984
985	985	func makeHttpHandler(eng *engine.Engine, logging bool, localMethod string, localRoute string, handlerFunc HttpApiFunc, enableCors bool, dockerVersion version.Version) http.HandlerFunc {

return write error