From d9f21d02a5bcf904c2cd59d81c8645645f18b92a Mon Sep 17 00:00:00 2001 From: Murat Kabilov Date: Tue, 24 Jul 2018 16:03:26 +0200 Subject: [PATCH] mind PreferSimpleProtocol parameter in the config Merge method --- conn.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/conn.go b/conn.go index 4ceac8a6..a8b61547 100644 --- a/conn.go +++ b/conn.go @@ -706,6 +706,8 @@ func (old ConnConfig) Merge(other ConnConfig) ConnConfig { cc.Dial = other.Dial } + cc.PreferSimpleProtocol = other.PreferSimpleProtocol + cc.RuntimeParams = make(map[string]string) for k, v := range old.RuntimeParams { cc.RuntimeParams[k] = v