[fix] cleanup rebase
git-svn-id: file:///srv/svn/repo/yukari/trunk@130 f3bd38d9-da89-464d-a02a-eb04e43141b5
This commit is contained in:
parent
ad9b87840e
commit
af8036aa09
5
morty.go
5
morty.go
@ -1041,7 +1041,6 @@ func main() {
|
||||
cfg.Debug = *flag.Bool("debug", cfg.Debug, "Debug mode")
|
||||
cfg.RequestTimeout = *flag.Uint("timeout", cfg.RequestTimeout, "Request timeout")
|
||||
version := flag.Bool("version", false, "Show version")
|
||||
requestTimeout := flag.Uint("timeout", 2, "Request timeout")
|
||||
socks5 := flag.String("socks5", "", "SOCKS5 proxy")
|
||||
flag.Parse()
|
||||
|
||||
@ -1050,10 +1049,6 @@ func main() {
|
||||
return
|
||||
}
|
||||
|
||||
if *ipv6 {
|
||||
CLIENT.DialDualStack = true
|
||||
}
|
||||
|
||||
if *socks5 != "" {
|
||||
// this disables CLIENT.DialDualStack
|
||||
CLIENT.Dial = fasthttpproxy.FasthttpSocksDialer(*socks5)
|
||||
|
Loading…
x
Reference in New Issue
Block a user