@@ -1,7 +1,7 @@

 # the following lines are in sorted order, FYI

 github.com/Azure/go-ansiterm d6e3b3328b783f23731bc4d058875b0371ff8109

 github.com/Microsoft/hcsshim v0.6.8

-github.com/Microsoft/go-winio v0.4.5

+github.com/Microsoft/go-winio v0.4.6

 github.com/davecgh/go-spew 346938d642f2ec3594ed81d874461961cd0faa76

 github.com/docker/libtrust 9cbd2a1374f46905c68a4eb3694a130610adc62a

 github.com/go-check/check 4ed411733c5785b40214c70bce814c3a3a689609 https://github.com/cpuguy83/check.git

@@ -22,6 +22,7 @@ import (

 const (

 	cERROR_PIPE_BUSY      = syscall.Errno(231)

+	cERROR_NO_DATA        = syscall.Errno(232)

 	cERROR_PIPE_CONNECTED = syscall.Errno(535)

 	cERROR_SEM_TIMEOUT    = syscall.Errno(121)

@@ -254,6 +255,36 @@ func (l *win32PipeListener) makeServerPipe() (*win32File, error) {

 	return f, nil

 }

+func (l *win32PipeListener) makeConnectedServerPipe() (*win32File, error) {

+	p, err := l.makeServerPipe()

+	if err != nil {

+		return nil, err

+	}

+

+	// Wait for the client to connect.

+	ch := make(chan error)

+	go func(p *win32File) {

+		ch <- connectPipe(p)

+	}(p)

+

+	select {

+	case err = <-ch:

+		if err != nil {

+			p.Close()

+			p = nil

+		}

+	case <-l.closeCh:

+		// Abort the connect request by closing the handle.

+		p.Close()

+		p = nil

+		err = <-ch

+		if err == nil || err == ErrFileClosed {

+			err = ErrPipeListenerClosed

+		}

+	}

+	return p, err

+}

+

 func (l *win32PipeListener) listenerRoutine() {

 	closed := false

 	for !closed {

@@ -261,31 +292,20 @@ func (l *win32PipeListener) listenerRoutine() {

 		case <-l.closeCh:

 			closed = true

 		case responseCh := <-l.acceptCh:

-			p, err := l.makeServerPipe()

-			if err == nil {

-				// Wait for the client to connect.

-				ch := make(chan error)

-				go func(p *win32File) {

-					ch <- connectPipe(p)

-				}(p)

-				select {

-				case err = <-ch:

-					if err != nil {

-						p.Close()

-						p = nil

-					}

-				case <-l.closeCh:

-					// Abort the connect request by closing the handle.

-					p.Close()

-					p = nil

-					err = <-ch

-					if err == nil || err == ErrFileClosed {

-						err = ErrPipeListenerClosed

-					}

-					closed = true

+			var (

+				p   *win32File

+				err error

+			)

+			for {

+				p, err = l.makeConnectedServerPipe()

+				// If the connection was immediately closed by the client, try

+				// again.

+				if err != cERROR_NO_DATA {

+					break

 				}

 			}

 			responseCh <- acceptResponse{p, err}

+			closed = err == ErrPipeListenerClosed

 		}

 	}

 	syscall.Close(l.firstHandle)