clearlinux/docker
2
0
Fork 0
mirror of https://github.com/clearlinux/docker.git synced 2026-09-28 17:10:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4710 from jimenez/4680-timeout_flag-fix

Browse Source 
Disable timeout
This commit is contained in:
unclejack
2014-03-18 00:38:39 +02:00
parent 30541ade82 25218f9b23
commit fb503da34e
2 changed files with 8 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
api/server.go
+2 -3
View File
@@ -26,7 +26,6 @@ import (
"strconv"
"strings"
"syscall"
"time"
)
var (
@@ -1135,7 +1134,7 @@ func changeGroup(addr string, nameOrGid string) error {
// ListenAndServe sets up the required http.Server and gets it listening for
// each addr passed in and does protocol specific checking.
func ListenAndServe(proto, addr string, eng *engine.Engine, logging, enableCors bool, dockerVersion string, socketGroup string) error {
func ListenAndServe(proto, addr string, eng *engine.Engine, logging, enableCors bool, dockerVersion, socketGroup string) error {
r, err := createRouter(eng, logging, enableCors, dockerVersion)
if err != nil {
@@ -1152,7 +1151,7 @@ func ListenAndServe(proto, addr string, eng *engine.Engine, logging, enableCors
}
}
l, err := listenbuffer.NewListenBuffer(proto, addr, activationLock, 15*time.Minute)
l, err := listenbuffer.NewListenBuffer(proto, addr, activationLock)
if err != nil {
return err
}