github
/
v2ray-core
mirror of https://github.com/v2ray/v2ray-core
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'master' of https://github.com/v2ray/v2ray-core

pull/299/head^2
v2ray 2016-06-03 20:21:53 +02:00
parent 4b92e6b25b e0c22860f1
commit 6c31ff91e6
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/router/rules/chinasites.go
View File

@ -185,6 +185,7 @@ func init() {
anySubDomain + "etao" + dotCom, anySubDomain + "etao" + dotCom,
anySubDomain + "excelhome" + dotNet, anySubDomain + "excelhome" + dotNet,
anySubDomain + "fanli" + dotCom, anySubDomain + "fanli" + dotCom,
anySubDomain + "feng" + dotCom,
anySubDomain + "fengniao" + dotCom, anySubDomain + "fengniao" + dotCom,
anySubDomain + "fhldns" + dotCom, anySubDomain + "fhldns" + dotCom,
anySubDomain + "foxmail" + dotCom, anySubDomain + "foxmail" + dotCom,
@ -192,6 +193,7 @@ func init() {
anySubDomain + "geetest" + dotCom, anySubDomain + "geetest" + dotCom,
anySubDomain + "geilicdn" + dotCom, anySubDomain + "geilicdn" + dotCom,
anySubDomain + "getui" + dotCom, anySubDomain + "getui" + dotCom,
anySubDomain + "google-analytics" + dotCom,
anySubDomain + "growingio" + dotCom, anySubDomain + "growingio" + dotCom,
anySubDomain + "gtags" + dotNet, anySubDomain + "gtags" + dotNet,
anySubDomain + "gwdang" + dotCom, anySubDomain + "gwdang" + dotCom,
@ -402,6 +404,7 @@ func init() {
anySubDomain + "tudouui" + dotCom, anySubDomain + "tudouui" + dotCom,
anySubDomain + "tuicool" + dotCom, anySubDomain + "tuicool" + dotCom,
anySubDomain + "tuniu" + dotCom, anySubDomain + "tuniu" + dotCom,
anySubDomain + "tutuapp" + dotCom,
anySubDomain + "u17" + dotCom, anySubDomain + "u17" + dotCom,
anySubDomain + "useso" + dotCom, anySubDomain + "useso" + dotCom,
anySubDomain + "unionpay" + dotCom, anySubDomain + "unionpay" + dotCom,
@ -417,10 +420,13 @@ func init() {
anySubDomain + "wallstreetcn" + dotCom, anySubDomain + "wallstreetcn" + dotCom,
anySubDomain + "wandoujia" + dotCom, anySubDomain + "wandoujia" + dotCom,
anySubDomain + "wdjimg" + dotCom, anySubDomain + "wdjimg" + dotCom,
anySubDomain + "weand" + dotCom,
anySubDomain + "webterren" + dotCom, anySubDomain + "webterren" + dotCom,
anySubDomain + "weibo" + dotCom, anySubDomain + "weibo" + dotCom,
anySubDomain + "weicaifu" + dotCom, anySubDomain + "weicaifu" + dotCom,
anySubDomain + "weidian" + dotCom, anySubDomain + "weidian" + dotCom,
anySubDomain + "weiphone" + dotCom,
anySubDomain + "weiphone" + dotNet,
anySubDomain + "weixing" + dotCom, anySubDomain + "weixing" + dotCom,
anySubDomain + "weiyun" + dotCom, anySubDomain + "weiyun" + dotCom,
anySubDomain + "wonnder" + dotCom, anySubDomain + "wonnder" + dotCom,

2
proxy/vmess/io/io_test.go
View File

@ -32,6 +32,7 @@ func TestSingleIO(t *testing.T) {
writer := NewAuthChunkWriter(v2io.NewAdaptiveWriter(content)) writer := NewAuthChunkWriter(v2io.NewAdaptiveWriter(content))
writer.Write(alloc.NewBuffer().Clear().AppendString("abcd")) writer.Write(alloc.NewBuffer().Clear().AppendString("abcd"))
writer.Write(alloc.NewBuffer().Clear())
writer.Release() writer.Release()
reader := NewAuthChunkReader(content) reader := NewAuthChunkReader(content)
@ -90,6 +91,7 @@ func TestLargeIO(t *testing.T) {
break break
} }
} }
writer.Write(alloc.NewBuffer().Clear())
writer.Release() writer.Release()
actualContent := make([]byte, 0, len(content)) actualContent := make([]byte, 0, len(content))