lzhr/v2fly
1
0
Fork 0
mirror of https://github.com/v2fly/v2ray-core.git synced 2024-09-28 14:56:33 -04:00
Code Issues Releases Wiki Activity

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

Browse Source
This commit is contained in:
v2ray 2016-06-03 20:21:53 +02:00
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 + "excelhome" + dotNet,
anySubDomain + "fanli" + dotCom,
anySubDomain + "feng" + dotCom,
anySubDomain + "fengniao" + dotCom,
anySubDomain + "fhldns" + dotCom,
anySubDomain + "foxmail" + dotCom,
@ -192,6 +193,7 @@ func init() {
anySubDomain + "geetest" + dotCom,
anySubDomain + "geilicdn" + dotCom,
anySubDomain + "getui" + dotCom,
anySubDomain + "google-analytics" + dotCom,
anySubDomain + "growingio" + dotCom,
anySubDomain + "gtags" + dotNet,
anySubDomain + "gwdang" + dotCom,
@ -402,6 +404,7 @@ func init() {
anySubDomain + "tudouui" + dotCom,
anySubDomain + "tuicool" + dotCom,
anySubDomain + "tuniu" + dotCom,
anySubDomain + "tutuapp" + dotCom,
anySubDomain + "u17" + dotCom,
anySubDomain + "useso" + dotCom,
anySubDomain + "unionpay" + dotCom,
@ -417,10 +420,13 @@ func init() {
anySubDomain + "wallstreetcn" + dotCom,
anySubDomain + "wandoujia" + dotCom,
anySubDomain + "wdjimg" + dotCom,
anySubDomain + "weand" + dotCom,
anySubDomain + "webterren" + dotCom,
anySubDomain + "weibo" + dotCom,
anySubDomain + "weicaifu" + dotCom,
anySubDomain + "weidian" + dotCom,
anySubDomain + "weiphone" + dotCom,
anySubDomain + "weiphone" + dotNet,
anySubDomain + "weixing" + dotCom,
anySubDomain + "weiyun" + 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.Write(alloc.NewBuffer().Clear().AppendString("abcd"))
writer.Write(alloc.NewBuffer().Clear())
writer.Release()
reader := NewAuthChunkReader(content)
@ -90,6 +91,7 @@ func TestLargeIO(t *testing.T) {
break
}
}
writer.Write(alloc.NewBuffer().Clear())
writer.Release()
actualContent := make([]byte, 0, len(content))