Merge branch '1.5'

prog/weaveutil/docker_tls_args.go

@@ -26,7 +26,12 @@ func dockerTLSArgs(args []string) error {
 			continue
 		}
 
-		if comm, err := ioutil.ReadFile(filepath.Join(procRoot, dirName, "comm")); err != nil || string(comm) != "docker\n" {
+		isDaemon := false
+		if comm, err := ioutil.ReadFile(filepath.Join(procRoot, dirName, "comm")); err != nil {
+			continue
+		} else if string(comm) == "dockerd\n" {
+			isDaemon = true
+		} else if string(comm) != "docker\n" {
 			continue
 		}
 
@@ -35,7 +40,6 @@ func dockerTLSArgs(args []string) error {
 			continue
 		}
 
-		isDaemon := false
 		tlsArgs := []string{}
 		args := bytes.Split(cmdline, []byte{'\000'})
 		for i := 0; i < len(args); i++ {

proxy/proxy_intercept.go

@@ -78,7 +78,7 @@ func doRawStream(w http.ResponseWriter, resp *http.Response, client *httputil.Cl
 	defer down.Close()
 	defer up.Close()
 
-	if _, err := down.Write([]byte("HTTP/1.1 200 OK\n")); err != nil {
+	if _, err := down.Write([]byte("HTTP/1.1 " + resp.Status + "\n")); err != nil {
 		Log.Warning(err)
 		return
 	}