aboutsummaryrefslogtreecommitdiff
path: root/server
diff options
context:
space:
mode:
authorNiall Sheridan <nsheridan@gmail.com>2017-06-17 21:56:52 +0100
committerNiall Sheridan <nsheridan@gmail.com>2017-06-17 21:56:52 +0100
commit68518d85c9b6707223471d73608971cc6b03c1ac (patch)
tree43662e38b36ab331a29ce115abe4496bbbafaaeb /server
parent435ea9907a7b75d5d5814572d934772b01a29d18 (diff)
Disable grpc multiplexer
Diffstat (limited to 'server')
-rw-r--r--server/server.go8
1 files changed, 1 insertions, 7 deletions
diff --git a/server/server.go b/server/server.go
index 676a61b..97b3c63 100644
--- a/server/server.go
+++ b/server/server.go
@@ -7,7 +7,6 @@ import (
"net"
"github.com/pkg/errors"
- "github.com/soheilhy/cmux"
"go4.org/wkfs"
"golang.org/x/crypto/acme/autocert"
@@ -108,10 +107,5 @@ func Run(conf *config.Config) {
}
log.Printf("Starting server on %s", laddr)
- cm := cmux.New(l)
- httpl := cm.Match(cmux.HTTP1Fast())
- grpcl := cm.Match(cmux.HTTP2HeaderField("content-type", "application/grpc"))
- go runHTTPServer(conf.Server, httpl)
- go runGRPCServer(grpcl)
- log.Fatal(cm.Serve())
+ runHTTPServer(conf.Server, l)
}