kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

Windows: Refix server_windows to match linux

Browse source 
Signed-off-by: John Howard <jhoward@microsoft.com>
This commit is contained in:
John Howard 2015-05-29 21:25:27 -07:00
parent 04c6f09fbd
commit 2b7569ccc3
1 changed files with 17 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
api/server/server_windows.go
View file

@ -11,28 +11,34 @@ import (
) )
// NewServer sets up the required Server and does protocol specific checking. // NewServer sets up the required Server and does protocol specific checking.
func (s *Server) newServer(proto, addr string) (serverCloser, error) { func (s *Server) newServer(proto, addr string) ([]serverCloser, error) {
var ( var (
err error ls []net.Listener
l net.Listener
) )
switch proto { switch proto {
case "tcp": case "tcp":
l, err = s.initTcpSocket(addr) l, err := s.initTcpSocket(addr)
if err != nil { if err != nil {
return nil, err return nil, err
} }
ls = append(ls, l)
default: default:
return nil, errors.New("Invalid protocol format. Windows only supports tcp.") return nil, errors.New("Invalid protocol format. Windows only supports tcp.")
} }
return &HttpServer{
var res []serverCloser
for _, l := range ls {
res = append(res, &HttpServer{
&http.Server{ &http.Server{
Addr: addr, Addr: addr,
Handler: s.router, Handler: s.router,
}, },
l, l,
}, nil })
}
return res, nil
} }
func (s *Server) AcceptConnections(d *daemon.Daemon) { func (s *Server) AcceptConnections(d *daemon.Daemon) {