Skip to content

Commit

Permalink
mind PreferSimpleProtocol parameter in the config Merge method
Browse files Browse the repository at this point in the history
  • Loading branch information
Murat Kabilov committed Jul 24, 2018
1 parent b8832c2 commit d9f21d0
Showing 1 changed file with 2 additions and 0 deletions.
2 changes: 2 additions & 0 deletions conn.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit d9f21d0

Please sign in to comment.