Merge pull request #2 from bnagy/patch-1

fix goroutine leak

Author: jamescun

shovel.go

@@ -6,18 +6,23 @@ import (
 
 // proxy between two sockets
 func Shovel(local, remote io.ReadWriteCloser) error {
-	err := make(chan error)
+	errch := make(chan error, 1)
 
-	go chanCopy(err, local, remote)
-	go chanCopy(err, remote, local)
+	go chanCopy(errch, local, remote)
+	go chanCopy(errch, remote, local)
 
-	return <-err
+	for i := 0; i < 2; i++ {
+		if err := <-errch; err != nil {
+			// If this returns early the second func will push into the
+			// buffer, and the GC will clean up
+			return err
+		}
+	}
+	return nil
 }
 
 // copy between pipes, sending errors to channel
 func chanCopy(e chan error, dst, src io.ReadWriter) {
 	_, err := io.Copy(dst, src)
-	if err != nil {
-		e <- err
-	}
+	e <- err
 }