From f54ede47239d97f7597481a0d47dae497deb00f6 Mon Sep 17 00:00:00 2001
From: Gyuho Lee <gyuhox@gmail.com>
Date: Tue, 27 Mar 2018 21:46:40 -0700
Subject: [PATCH 1/2] vendor: upgrade "soheilhy/cmux" to "v0.1.4"

Signed-off-by: Gyuho Lee <gyuhox@gmail.com>
---
 Gopkg.lock                                  | 4 ++--
 vendor/github.com/soheilhy/cmux/cmux.go     | 3 ++-
 vendor/github.com/soheilhy/cmux/matchers.go | 5 +++++
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/Gopkg.lock b/Gopkg.lock
index 3fd20239e..0a906f849 100644
--- a/Gopkg.lock
+++ b/Gopkg.lock
@@ -203,8 +203,8 @@
 [[projects]]
   name = "github.com/soheilhy/cmux"
   packages = ["."]
-  revision = "bb79a83465015a27a175925ebd155e660f55e9f1"
-  version = "v0.1.3"
+  revision = "e09e9389d85d8492d313d73d1469c029e710623f"
+  version = "v0.1.4"
 
 [[projects]]
   name = "github.com/spf13/cobra"
diff --git a/vendor/github.com/soheilhy/cmux/cmux.go b/vendor/github.com/soheilhy/cmux/cmux.go
index 9de6b0a3c..80403423d 100644
--- a/vendor/github.com/soheilhy/cmux/cmux.go
+++ b/vendor/github.com/soheilhy/cmux/cmux.go
@@ -116,8 +116,9 @@ type cMux struct {
 func matchersToMatchWriters(matchers []Matcher) []MatchWriter {
 	mws := make([]MatchWriter, 0, len(matchers))
 	for _, m := range matchers {
+		cm := m
 		mws = append(mws, func(w io.Writer, r io.Reader) bool {
-			return m(r)
+			return cm(r)
 		})
 	}
 	return mws
diff --git a/vendor/github.com/soheilhy/cmux/matchers.go b/vendor/github.com/soheilhy/cmux/matchers.go
index 652fd8691..878ae98cc 100644
--- a/vendor/github.com/soheilhy/cmux/matchers.go
+++ b/vendor/github.com/soheilhy/cmux/matchers.go
@@ -240,6 +240,11 @@ func matchHTTP2Field(w io.Writer, r io.Reader, name string, matches func(string)
 
 		switch f := f.(type) {
 		case *http2.SettingsFrame:
+			// Sender acknoweldged the SETTINGS frame. No need to write
+			// SETTINGS again.
+			if f.IsAck() {
+				break
+			}
 			if err := framer.WriteSettings(); err != nil {
 				return false
 			}

From 9377e5169bde1c0c2165f99971a5729478476d22 Mon Sep 17 00:00:00 2001
From: Gyuho Lee <gyuhox@gmail.com>
Date: Tue, 27 Mar 2018 21:48:24 -0700
Subject: [PATCH 2/2] CHANGELOG-3.4: highlight "soheilhy/cmux" dependency
 upgrade

Signed-off-by: Gyuho Lee <gyuhox@gmail.com>
---
 CHANGELOG-3.4.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG-3.4.md b/CHANGELOG-3.4.md
index 4b9fbf169..b5899d855 100644
--- a/CHANGELOG-3.4.md
+++ b/CHANGELOG-3.4.md
@@ -65,6 +65,7 @@ See [code changes](https://github.com/coreos/etcd/compare/v3.3.0...v3.4.0) and [
 ### Dependency
 
 - TODO: Upgrade [`google.golang.org/grpc`](https://github.com/grpc/grpc-go/releases) from [**`v1.7.5`**](https://github.com/grpc/grpc-go/releases/tag/v1.7.5) to [**`v1.11.0`**](https://github.com/grpc/grpc-go/releases/tag/v1.11.0).
+- Upgrade [`github.com/soheilhy/cmux`](https://github.com/soheilhy/cmux/releases) from [**`v0.1.3`**](https://github.com/soheilhy/cmux/releases/tag/v0.1.3) to [**`v0.1.4`**](https://github.com/soheilhy/cmux/releases/tag/v0.1.4).
 
 ### Metrics, Monitoring