kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

Resolve connection reset by peer regression

Browse source 
Signed-off-by: Jim Minter <jminter@redhat.com>
(cherry picked from commit dc0ee98805)
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
This commit is contained in:
Jim Minter 2017-03-15 09:36:44 +00:00 • committed by Victor Vieux
parent fbd3d64212
commit 9c05b1049f
1 changed files with 6 additions and 2 deletions

8
daemon/attach.go
View file

@ -36,7 +36,7 @@ func (daemon *Daemon) ContainerAttach(prefixOrName string, c *backend.ContainerA
} }
cfg := stream.AttachConfig{ cfg := stream.AttachConfig{
UseStdin: c.UseStdin && container.Config.OpenStdin, UseStdin: c.UseStdin,
UseStdout: c.UseStdout, UseStdout: c.UseStdout,
UseStderr: c.UseStderr, UseStderr: c.UseStderr,
TTY: container.Config.Tty, TTY: container.Config.Tty,
@ -79,7 +79,7 @@ func (daemon *Daemon) ContainerAttachRaw(prefixOrName string, stdin io.ReadClose
return err return err
} }
cfg := stream.AttachConfig{ cfg := stream.AttachConfig{
UseStdin: stdin != nil && container.Config.OpenStdin, UseStdin: stdin != nil,
UseStdout: stdout != nil, UseStdout: stdout != nil,
UseStderr: stderr != nil, UseStderr: stderr != nil,
TTY: container.Config.Tty, TTY: container.Config.Tty,
@ -147,6 +147,10 @@ func (daemon *Daemon) containerAttach(c *container.Container, cfg *stream.Attach
cfg.Stdin = r cfg.Stdin = r
} }
if !c.Config.OpenStdin {
cfg.Stdin = nil
}
waitChan := make(chan struct{}) waitChan := make(chan struct{})
if c.Config.StdinOnce && !c.Config.Tty { if c.Config.StdinOnce && !c.Config.Tty {
defer func() { defer func() {