Merge pull request #436 from ikitiki/fix-config-merge

Mind PreferSimpleProtocol parameter in the config Merge method
This commit is contained in:
Jack Christensen 2018-07-24 09:53:07 -05:00 committed by GitHub
commit 93ee40e691
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -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