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

Merge pull request #6320 from LK4D4/fix_stdcopy_eof 

Don't exit on eof in header reading in stdcopy
This commit is contained in:
Michael Crosby 2014-06-17 14:20:13 -07:00
parent 3336bdf5b5 b1bae92534
commit 4dcf4e9bd0
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
utils/stdcopy.go
View File

@ -82,13 +82,14 @@ func StdCopy(dstout, dsterr io.Writer, src io.Reader) (written int64, err error)
for nr < StdWriterPrefixLen { for nr < StdWriterPrefixLen {
var nr2 int var nr2 int
nr2, er = src.Read(buf[nr:]) nr2, er = src.Read(buf[nr:])
if er == io.EOF { // Don't exit on EOF, because we can have some more input
return written, nil if er != nil && er != io.EOF {
}
if er != nil {
return 0, er return 0, er
} }
nr += nr2 nr += nr2
if nr == 0 {
return written, nil
}
} }
// Check the first byte to know where to write // Check the first byte to know where to write