mirror of
https://github.com/fnproject/fn.git
synced 2022-10-28 21:29:17 +03:00
update vendor/ dir to latest w/o heroku, moby
had to lock a lot of things in place
This commit is contained in:
7
vendor/github.com/fsouza/go-dockerclient/client.go
generated
vendored
7
vendor/github.com/fsouza/go-dockerclient/client.go
generated
vendored
@@ -498,6 +498,7 @@ type streamOptions struct {
|
||||
in io.Reader
|
||||
stdout io.Writer
|
||||
stderr io.Writer
|
||||
reqSent chan struct{}
|
||||
// timeout is the initial connection timeout
|
||||
timeout time.Duration
|
||||
// Timeout with no data is received, it's reset every time new data
|
||||
@@ -576,6 +577,9 @@ func (c *Client) stream(method, path string, streamOptions streamOptions) error
|
||||
dial.SetDeadline(time.Now().Add(streamOptions.timeout))
|
||||
}
|
||||
|
||||
if streamOptions.reqSent != nil {
|
||||
close(streamOptions.reqSent)
|
||||
}
|
||||
if resp, err = http.ReadResponse(breader, req); err != nil {
|
||||
// Cancel timeout for future I/O operations
|
||||
if streamOptions.timeout > 0 {
|
||||
@@ -594,6 +598,9 @@ func (c *Client) stream(method, path string, streamOptions streamOptions) error
|
||||
}
|
||||
return chooseError(subCtx, err)
|
||||
}
|
||||
if streamOptions.reqSent != nil {
|
||||
close(streamOptions.reqSent)
|
||||
}
|
||||
}
|
||||
defer resp.Body.Close()
|
||||
if resp.StatusCode < 200 || resp.StatusCode >= 400 {
|
||||
|
||||
Reference in New Issue
Block a user