2299 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Darien Raymond	c422196280	safe return in blackhole	2017-02-11 00:41:14 +01:00
Darien Raymond	237ccf505c	Merge branch 'master' of https://github.com/v2ray/v2ray-core	2017-02-10 17:19:16 +01:00
Darien Raymond	6c0fc4b0ec	fix ineffectual assign in core	2017-02-10 16:54:51 +01:00
Darien Raymond	5ccc915f8f	typo	2017-02-10 16:50:45 +01:00
Darien Raymond	6888093197	gofmt	2017-02-10 16:42:24 +01:00
Darien Raymond	2ba59428c9	remove lock in websocket connection	2017-02-10 16:41:54 +01:00
Darien Raymond	cc58f5cb8f	doc	2017-02-10 16:38:32 +01:00
Darien Raymond	a32063dfb5	refactor core	2017-02-10 16:25:54 +01:00
Darien Raymond	e57124ab87	remove unnecessary error message	2017-02-10 12:01:52 +01:00
Darien Raymond	396cf21597	output detailed error message	2017-02-10 12:00:37 +01:00
Darien Raymond	cfcf16feed	fix typo	2017-02-10 11:57:59 +01:00
Darien Raymond	1aeab3dd96	normalized path in websocket	2017-02-10 11:47:53 +01:00
Darien Raymond	5e7fb6d0dd	refine error handling in retry logic	2017-02-10 11:41:50 +01:00
Darien Raymond	51745e772c	rename	2017-02-09 22:55:12 +01:00
Darien Raymond	d04d92c187	update context functions	2017-02-09 22:49:38 +01:00
Darien Raymond	d270a99d4f	simplify code	2017-02-09 12:31:40 +01:00
Darien Raymond	0d68293ef8	fix test break	2017-02-09 12:31:26 +01:00
Darien Raymond	cdb0b94046	cleanup websocket code	2017-02-09 11:42:17 +01:00
Darien Raymond	e5fbe56e2e	fix test break	2017-02-09 11:42:03 +01:00
Darien Raymond	5ec3fe093d	fix test break	2017-02-08 19:00:13 +01:00
Darien Raymond	3be6c72211	cleanup websocket code	2017-02-08 18:30:16 +01:00
Darien Raymond	fc1b37d809	test case for TLS over websocket	2017-02-08 17:57:21 +01:00
Darien Raymond	f99bd8b8b2	remove unused functions	2017-02-08 10:38:36 +01:00
Darien Raymond	27b0401c20	remove context functions for allow passive connection	2017-02-08 10:37:53 +01:00
Darien Raymond	dc8e94ac79	test case for transport config	2017-02-08 10:26:58 +01:00
Darien Raymond	5de7fb8bc2	comments	2017-02-08 10:01:22 +01:00
Darien Raymond	d2968e08ea	suspend ipv6 test	2017-02-08 00:45:29 +01:00
Darien Raymond	2a486c6b9e	ipv6 test	2017-02-08 00:26:40 +01:00
Darien Raymond	6bcce77afb	fix import	2017-02-07 23:33:40 +01:00
Darien Raymond	a0f2dabe5c	fix kcp test	2017-02-07 23:33:21 +01:00
Darien Raymond	d2538839af	fix byte assertion	2017-02-07 23:33:02 +01:00
Darien Raymond	8b1bedc607	fix time update in travis	2017-02-07 22:38:25 +01:00
Darien Raymond	d7167f552d	remove allowPassiveConnection from config	2017-02-07 21:28:21 +01:00
Darien Raymond	bd308e7817	sync time for test	2017-02-07 21:24:14 +01:00
Darien Raymond	e7a7b38319	Merge branch 'master' of https://github.com/v2ray/v2ray-core	2017-02-07 21:11:50 +01:00
Darien Raymond	b652032d9d	update for mux	2017-02-07 21:11:47 +01:00
Darien Raymond	b9eb40622d	Merge branch 'master' of https://github.com/v2ray/v2ray-core	2017-02-07 17:37:29 +01:00
Darien Raymond	d72029211f	completely remove allow passive connection	2017-02-07 17:37:26 +01:00
Darien Raymond	338c4f5cc9	Update .travis.yml	2017-02-07 17:03:42 +01:00
Darien Raymond	c245b4506e	Update .travis.yml	2017-02-07 10:29:18 +01:00
Darien Raymond	4e8e15d528	refine error handling in byte reader	2017-02-07 00:39:07 +01:00
Darien Raymond	3643dc37e0	refine kcp output	2017-02-07 00:38:46 +01:00
Darien Raymond	14bbb58b12	fix bytes assertion	2017-02-06 23:25:52 +01:00
Darien Raymond	a8abd68574	Merge branch 'master' of https://github.com/v2ray/v2ray-core	2017-02-06 23:21:46 +01:00
Darien Raymond	d27743b3b9	rewrite vmess test	2017-02-06 15:36:55 +01:00
Darien Raymond	2897df5a7a	don't copy leftoever if at head	2017-02-06 14:06:41 +01:00
Darien Raymond	775b4ef542	update auth test	2017-02-06 14:02:17 +01:00
Darien Raymond	ce34a25e66	fix build break	2017-02-06 13:49:03 +01:00
Darien Raymond	47c3646162	refine authentication reader	2017-02-06 13:31:36 +01:00
Darien Raymond	6144b2ff55	update reference	2017-02-05 09:15:52 +01:00