mirror of
https://github.com/aykhans/sarin.git
synced 2026-02-27 22:39:13 +00:00
Override Methods and Bodies instead of appending in Config.Merge
This commit is contained in:
@@ -275,7 +275,7 @@ func (config Config) Print() bool {
|
|||||||
func (config *Config) Merge(newConfig *Config) {
|
func (config *Config) Merge(newConfig *Config) {
|
||||||
config.Files = append(config.Files, newConfig.Files...)
|
config.Files = append(config.Files, newConfig.Files...)
|
||||||
if len(newConfig.Methods) > 0 {
|
if len(newConfig.Methods) > 0 {
|
||||||
config.Methods = append(config.Methods, newConfig.Methods...)
|
config.Methods = newConfig.Methods
|
||||||
}
|
}
|
||||||
if newConfig.URL != nil {
|
if newConfig.URL != nil {
|
||||||
config.URL = newConfig.URL
|
config.URL = newConfig.URL
|
||||||
@@ -317,7 +317,7 @@ func (config *Config) Merge(newConfig *Config) {
|
|||||||
config.Cookies = append(config.Cookies, newConfig.Cookies...)
|
config.Cookies = append(config.Cookies, newConfig.Cookies...)
|
||||||
}
|
}
|
||||||
if len(newConfig.Bodies) != 0 {
|
if len(newConfig.Bodies) != 0 {
|
||||||
config.Bodies = append(config.Bodies, newConfig.Bodies...)
|
config.Bodies = newConfig.Bodies
|
||||||
}
|
}
|
||||||
if len(newConfig.Proxies) != 0 {
|
if len(newConfig.Proxies) != 0 {
|
||||||
config.Proxies.Append(newConfig.Proxies...)
|
config.Proxies.Append(newConfig.Proxies...)
|
||||||
|
|||||||
Reference in New Issue
Block a user