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
Родитель f91a79e071 266a1044de
Коммит 53d5299a40
1 изменённых файлов: 8 добавлений и 4 удалений

Просмотреть файл

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