diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-07-14 13:39:58 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-14 13:39:58 -0400 |
| commit | ace19c75ad61f96239996959aee0db361abbf501 (patch) | |
| tree | f0f80c58facd06f9c55df651ef7cc5fcf09ac853 /libpod | |
| parent | 9d98f56a64852d3bf9d3b27ad6e1ac3e3ebb6622 (diff) | |
| parent | cbbb1a80f5ccbbec5496f253cabce0f65df0f656 (diff) | |
| download | podman-ace19c75ad61f96239996959aee0db361abbf501.tar.gz podman-ace19c75ad61f96239996959aee0db361abbf501.tar.bz2 podman-ace19c75ad61f96239996959aee0db361abbf501.zip | |
Merge pull request #10916 from mheon/fix_7360
Perform a one-sided close of HTTP attach conn on EOF
Diffstat (limited to 'libpod')
| -rw-r--r-- | libpod/oci_conmon_exec_linux.go | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/libpod/oci_conmon_exec_linux.go b/libpod/oci_conmon_exec_linux.go index 09d3d1833..05a4e19b0 100644 --- a/libpod/oci_conmon_exec_linux.go +++ b/libpod/oci_conmon_exec_linux.go @@ -610,6 +610,9 @@ func attachExecHTTP(c *Container, sessionID string, r *http.Request, w http.Resp _, err := utils.CopyDetachable(conn, httpBuf, detachKeys) logrus.Debugf("STDIN copy completed") stdinChan <- err + if connErr := conn.CloseWrite(); connErr != nil { + logrus.Errorf("Unable to close conn: %v", connErr) + } }() } |