Merge branch 'develop'

cyfdecyf · cyfdecyf · commit e8095ee37ad4 · 2016-05-05T21:43:31.000+08:00
diff --git a/cmd/shadowsocks-local/local.go b/cmd/shadowsocks-local/local.go
@@ -382,7 +382,7 @@ func main() {
 	ss.SetDebug(debug)
 
 	if strings.HasSuffix(cmdConfig.Method, "-auth") {
-		cmdConfig.Method = cmdConfig.Method[:len(cmdConfig.Method)-4]
+		cmdConfig.Method = cmdConfig.Method[:len(cmdConfig.Method)-5]
 		cmdConfig.Auth = true
 	}
 
diff --git a/cmd/shadowsocks-server/server.go b/cmd/shadowsocks-server/server.go
@@ -346,7 +346,7 @@ func main() {
 	ss.SetDebug(debug)
 
 	if strings.HasSuffix(cmdConfig.Method, "-auth") {
-		cmdConfig.Method = cmdConfig.Method[:len(cmdConfig.Method)-4]
+		cmdConfig.Method = cmdConfig.Method[:len(cmdConfig.Method)-5]
 		cmdConfig.Auth = true
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -382,7 +382,7 @@ func main() {`
`382`	`382`	`ss.SetDebug(debug)`
`383`	`383`
`384`	`384`	`if strings.HasSuffix(cmdConfig.Method, "-auth") {`
`385`		`- cmdConfig.Method = cmdConfig.Method[:len(cmdConfig.Method)-4]`
	`385`	`+ cmdConfig.Method = cmdConfig.Method[:len(cmdConfig.Method)-5]`
`386`	`386`	`cmdConfig.Auth = true`
`387`	`387`	`}`
`388`	`388`
Original file line number	Diff line number	Diff line change
`@@ -346,7 +346,7 @@ func main() {`
`346`	`346`	`ss.SetDebug(debug)`
`347`	`347`
`348`	`348`	`if strings.HasSuffix(cmdConfig.Method, "-auth") {`
`349`		`- cmdConfig.Method = cmdConfig.Method[:len(cmdConfig.Method)-4]`
	`349`	`+ cmdConfig.Method = cmdConfig.Method[:len(cmdConfig.Method)-5]`
`350`	`350`	`cmdConfig.Auth = true`
`351`	`351`	`}`
`352`	`352`