From 6b0e6d9b68f86f5141979782c44868ba6223c143 Mon Sep 17 00:00:00 2001
From: ale <ale@incal.net>
Date: Thu, 14 Dec 2017 07:43:29 +0000
Subject: [PATCH] Update deps
---
.../ai3/go-common/serverutil/http.go | 11 ++++++++---
vendor/vendor.json | 18 +++++++++---------
2 files changed, 17 insertions(+), 12 deletions(-)
diff --git a/vendor/git.autistici.org/ai3/go-common/serverutil/http.go b/vendor/git.autistici.org/ai3/go-common/serverutil/http.go
index b1d4b949..81c9ae90 100644
--- a/vendor/git.autistici.org/ai3/go-common/serverutil/http.go
+++ b/vendor/git.autistici.org/ai3/go-common/serverutil/http.go
@@ -70,8 +70,8 @@ func Serve(h http.Handler, serverConfig *ServerConfig, addr string) (err error)
// down remaining clients.
ctx, cancel := context.WithTimeout(context.Background(), gracefulShutdownTimeout)
defer cancel()
- if err := srv.Shutdown(ctx); err == context.Canceled {
- if err := srv.Close(); err != nil {
+ if err = srv.Shutdown(ctx); err == context.Canceled {
+ if err = srv.Close(); err != nil {
log.Printf("error terminating server: %v", err)
}
}
@@ -80,7 +80,12 @@ func Serve(h http.Handler, serverConfig *ServerConfig, addr string) (err error)
}()
signal.Notify(sigCh, syscall.SIGINT, syscall.SIGTERM)
- if err := srv.ListenAndServe(); err != http.ErrServerClosed {
+ if tlsConfig != nil {
+ err = srv.ListenAndServeTLS("", "")
+ } else {
+ err = srv.ListenAndServe()
+ }
+ if err != http.ErrServerClosed {
return err
}
diff --git a/vendor/vendor.json b/vendor/vendor.json
index 8026fa82..ce9de66e 100644
--- a/vendor/vendor.json
+++ b/vendor/vendor.json
@@ -5,26 +5,26 @@
{
"checksumSHA1": "raJx5BjBbVQG0ylGSjPpi+JvqjU=",
"path": "git.autistici.org/ai3/go-common",
- "revision": "c2c933578837d28b6f0e9b0b4b183d53ab28785e",
- "revisionTime": "2017-12-11T08:01:45Z"
+ "revision": "cd9ee1e6cc35b08a350d3dcb1b331750b363a82d",
+ "revisionTime": "2017-12-14T07:42:45Z"
},
{
"checksumSHA1": "2X2UMundICtpGTb8pTdBk7PCKss=",
"path": "git.autistici.org/ai3/go-common/clientutil",
- "revision": "c2c933578837d28b6f0e9b0b4b183d53ab28785e",
- "revisionTime": "2017-12-11T08:01:45Z"
+ "revision": "cd9ee1e6cc35b08a350d3dcb1b331750b363a82d",
+ "revisionTime": "2017-12-14T07:42:45Z"
},
{
"checksumSHA1": "mEnXMNziH82HFtGngHU19VHTVHs=",
"path": "git.autistici.org/ai3/go-common/ldap",
- "revision": "c2c933578837d28b6f0e9b0b4b183d53ab28785e",
- "revisionTime": "2017-12-11T08:01:45Z"
+ "revision": "cd9ee1e6cc35b08a350d3dcb1b331750b363a82d",
+ "revisionTime": "2017-12-14T07:42:45Z"
},
{
- "checksumSHA1": "3bComZxAfgnoTG4UDlyFgLyeykc=",
+ "checksumSHA1": "g6I5506EXkjQetiXSYbVTypDnDM=",
"path": "git.autistici.org/ai3/go-common/serverutil",
- "revision": "c2c933578837d28b6f0e9b0b4b183d53ab28785e",
- "revisionTime": "2017-12-11T08:01:45Z"
+ "revision": "cd9ee1e6cc35b08a350d3dcb1b331750b363a82d",
+ "revisionTime": "2017-12-14T07:42:45Z"
},
{
"checksumSHA1": "DFjm2ZJpUwioPApa3htGXLEFWl8=",
--
GitLab