projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '19620-remove-old-s3-driver'
[arvados.git]
/
sdk
/
go
/
httpserver
/
httpserver.go
diff --git
a/sdk/go/httpserver/httpserver.go
b/sdk/go/httpserver/httpserver.go
index 396fe42009d19c04bbfb9a280cf34b5ac4d8f54a..627e04f0be53d16814fba92399e4ca11d87891ec 100644
(file)
--- a/
sdk/go/httpserver/httpserver.go
+++ b/
sdk/go/httpserver/httpserver.go
@@
-1,3
+1,7
@@
+// Copyright (C) The Arvados Authors. All rights reserved.
+//
+// SPDX-License-Identifier: Apache-2.0
+
package httpserver
import (
package httpserver
import (
@@
-39,7
+43,12
@@
func (srv *Server) Start() error {
srv.cond = sync.NewCond(mutex.RLocker())
srv.running = true
go func() {
srv.cond = sync.NewCond(mutex.RLocker())
srv.running = true
go func() {
- err = srv.Serve(tcpKeepAliveListener{srv.listener})
+ lnr := tcpKeepAliveListener{srv.listener}
+ if srv.TLSConfig != nil {
+ err = srv.ServeTLS(lnr, "", "")
+ } else {
+ err = srv.Serve(lnr)
+ }
if !srv.wantDown {
srv.err = err
}
if !srv.wantDown {
srv.err = err
}