docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9497 from icecrime/86580-tls_interactive_exec 

Fix interactive exec over TLS
This commit is contained in:
Jessie Frazelle 2014-12-06 13:12:06 -08:00
parent f91a79e071 266a1044de
commit 53d5299a40
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
api/server/server.go
View File

@ -1136,15 +1136,19 @@ func postContainerExecStart(eng *engine.Engine, version version.Version, w http.
} }
defer func() { defer func() {
if tcpc, ok := inStream.(*net.TCPConn); ok { if cw, ok := inStream.(interface {
tcpc.CloseWrite() CloseWrite() error
}); ok {
cw.CloseWrite()
} else { } else {
inStream.Close() inStream.Close()
} }
}() }()
defer func() { defer func() {
if tcpc, ok := outStream.(*net.TCPConn); ok { if cw, ok := outStream.(interface {
tcpc.CloseWrite() CloseWrite() error
}); ok {
cw.CloseWrite()
} else if closer, ok := outStream.(io.Closer); ok { } else if closer, ok := outStream.(io.Closer); ok {
closer.Close() closer.Close()
} }