Merged changes

Upstream-commit: 4031a01af1658225344af04be0dbd4225893c242 Component: engine
2013-04-22 18:38:42 -07:00
parent 80a0321a4f
commit 5e92f87f4e
82 changed files with 2525 additions and 609 deletions
@@ -138,7 +138,8 @@ func ListenAndServe(proto, addr string, service Service) error {
 			if err != nil {
 				return err
 			}
-			go func() {
+			go func(conn DockerConn) {
+				defer conn.Close()
 				if DEBUG_FLAG {
 					CLIENT_SOCKET = conn
 				}
@@ -146,8 +147,7 @@ func ListenAndServe(proto, addr string, service Service) error {
 					log.Println("Error:", err.Error())
 					fmt.Fprintln(conn, "Error:", err.Error())
 				}
-				conn.Close()
-			}()
+			}(conn)
 		}
 	}
 	return nil