86 Commits

Author	SHA1	Message	Date
Darien Raymond	c287df631d	remove json conf from core	2017-05-17 12:02:35 +02:00
Darien Raymond	8879206252	use subdomain for china sites	2017-05-08 12:22:23 +02:00
Darien Raymond	a0bde091d4	sub domain matcher	2017-05-08 12:18:13 +02:00
Darien Raymond	43dfb8ced3	json config for domain override	2017-04-25 11:18:13 +02:00
Darien Raymond	67dbb86b0e	cleanup	2017-04-21 13:26:54 +02:00
Darien Raymond	c89cd8ae24	settings for mux concurrency	2017-04-12 10:40:21 +02:00
Darien Raymond	68bc9ea8e4	cleanup error messages	2017-04-09 15:04:04 +02:00
Darien Raymond	35248497d2	refactor error messages	2017-04-09 01:43:25 +02:00
Darien Raymond	bc4e2293ef	remove errors.Format	2017-04-09 00:31:06 +02:00
Darien Raymond	ade8453c0a	completely remove connection reuse feature	2017-04-07 21:54:40 +02:00
Darien Raymond	75f5cb9afb	refactor log and error	2017-04-06 21:13:17 +02:00
Darien Raymond	fc31f9b94c	refactor error interface	2017-04-06 15:13:09 +02:00
Darien Raymond	5686566139	apply mux in client	2017-04-02 21:30:21 +02:00
Darien Raymond	d04d92c187	update context functions	2017-02-09 22:49:38 +01:00
Darien Raymond	e5fbe56e2e	fix test break	2017-02-09 11:42:03 +01:00
Darien Raymond	dc8e94ac79	test case for transport config	2017-02-08 10:26:58 +01:00
Darien Raymond	d7167f552d	remove allowPassiveConnection from config	2017-02-07 21:28:21 +01:00
Darien Raymond	d3d2fab1d9	refine error messages	2017-02-02 14:42:31 +01:00
Darien Raymond	f046f334cd	move common/log to app/log	2017-02-01 21:35:40 +01:00
Darien Raymond	57fc444b3c	check nil for outbound config	2017-02-01 12:15:18 +01:00
Darien Raymond	32abea1397	default freedom timeout to 600	2017-01-27 09:01:39 +01:00
Darien Raymond	b2683a8bf0	default host	2017-01-26 23:09:46 +01:00
Darien Raymond	9462f710a5	able to redirect to another destination in freedom	2017-01-26 23:05:24 +01:00
Darien Raymond	ca721230e1	split listening settings from inbound proxies and apply context	2017-01-26 20:46:44 +01:00
Darien Raymond	008407ebb4	Merge pull request #369 from ToutyRater/master ... Update router_chinasites.go	2017-01-24 17:36:29 +01:00
ToutyRater	58e2902c52	Update router_chinasites.go	2017-01-24 15:32:51 +00:00
Darien Raymond	b3aa3200ed	fix error messages for socks config	2017-01-17 10:44:24 +01:00
Darien Raymond	6eff0acc0b	rename transportsettings to transportconfig	2017-01-16 14:18:33 +01:00
Darien Raymond	9a0ddb78ff	fix noop connection header	2017-01-16 14:17:59 +01:00
Darien Raymond	195594bed0	fix network list build	2017-01-13 21:58:18 +01:00
Darien Raymond	d24fe9dbfb	separate network and transport protocol	2017-01-12 12:54:34 +01:00
Darien Raymond	74ad6eaff9	test case for socks json config	2017-01-08 22:07:44 +01:00
Darien Raymond	24a8ad6dcf	enable socks outbound	2017-01-08 01:25:35 +01:00
Darien Raymond	723207158f	Merge branch 'master' of https://github.com/v2ray/v2ray-core	2017-01-04 11:10:52 +01:00
Darien Raymond	588c43f291	kcp header as wechat video	2017-01-03 22:46:22 +01:00
Darien Raymond	31d6e74482	remove rawtcp	2017-01-03 14:53:59 +01:00
Darien Raymond	1e5061f15e	fix #351	2017-01-03 01:37:27 +01:00
Darien Raymond	7dc7937443	rename ws to websocket	2016-12-23 00:30:46 +01:00
Darien Raymond	25533412db	comments	2016-12-21 21:43:00 +01:00
Darien Raymond	09c0fa558a	comments	2016-12-15 15:55:31 +01:00
Darien Raymond	4e3ed19308	fix parser for escape	2016-12-15 15:53:23 +01:00
Darien Raymond	50bc195f7f	rename TypedSettings to TypedMessage	2016-12-15 11:51:09 +01:00
Darien Raymond	5bbbdc05de	errors.Format	2016-12-15 11:05:32 +01:00
Darien Raymond	49202930ff	bug fix	2016-12-15 00:00:44 +01:00
Darien Raymond	b469dea315	json reader that allows comments	2016-12-14 23:51:03 +01:00
Darien Raymond	3b5a791ae8	simplify IPOrDomain construction	2016-12-14 23:04:02 +01:00
Darien Raymond	d6a6e0aaf8	send back http response on error	2016-12-14 12:25:22 +01:00
Darien Raymond	a11d2ce9d6	support server name override	2016-12-11 23:58:37 +01:00
Darien Raymond	d0b301594d	support security = "auto"	2016-12-11 14:58:53 +01:00
Darien Raymond	0b16486fce	Fix TLS type	2016-12-09 13:42:06 +01:00