Merge pull request cri-o#2770 from openshift-cherrypick-robot/cherry-pick-2697-to-release-1.14

openshift-merge-robot · web-flow · commit 458a99d48391 · 2019-09-05T04:40:19.000+02:00
[release-1.14] Use HTTP2MatchHeaderFieldSendSettings for incoming gRPC connections
diff --git a/cmd/crio/main.go b/cmd/crio/main.go
@@ -632,7 +632,7 @@ func main() {
 		}
 
 		m := cmux.New(lis)
-		grpcL := m.Match(cmux.HTTP2HeaderField("content-type", "application/grpc"))
+		grpcL := m.MatchWithWriters(cmux.HTTP2MatchHeaderFieldSendSettings("content-type", "application/grpc"))
 		httpL := m.Match(cmux.HTTP1Fast())
 
 		infoMux := service.GetInfoMux()

Original file line number	Diff line number	Diff line change
`@@ -632,7 +632,7 @@ func main() {`
`632`	`632`	`}`
`633`	`633`
`634`	`634`	`m := cmux.New(lis)`
`635`		`- grpcL := m.Match(cmux.HTTP2HeaderField("content-type", "application/grpc"))`
	`635`	`+ grpcL := m.MatchWithWriters(cmux.HTTP2MatchHeaderFieldSendSettings("content-type", "application/grpc"))`
`636`	`636`	`httpL := m.Match(cmux.HTTP1Fast())`
`637`	`637`
`638`	`638`	`infoMux := service.GetInfoMux()`