580 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
fatedier	a1ac002694	update golib, fix #959	2018-11-07 21:10:47 +08:00
fatedier	3b3f3dc2b5	Merge pull request #947 from HaraldNordgren/master ... Bump Travis versions	2018-10-29 10:16:58 +08:00
fatedier	ec0b59732c	Merge pull request #955 from muesli/readme-fixes ... Grammar fixes and improved README	2018-10-25 10:43:02 +08:00
Christian Muehlhaeuser	bae1ecdc69	Grammar fixes and improved README ... I think this reads nicer and more accurately describes the HTTP reverse proxying.	2018-10-25 00:57:50 +02:00
Harald Nordgren	5c2ab5a749	Bump Travis versions	2018-10-19 21:01:21 +02:00
fatedier	229740524e	Merge pull request #891 from mark86092/bump-docker-to-1-10 ... Upgrade dockerfile golang to 1.10	2018-08-12 22:04:49 +08:00
Yen-chi Chen	cbeeac06a5	Upgrade golang to 1.10	2018-08-12 15:03:48 +08:00
fatedier	66a69f873f	Merge pull request #890 from fatedier/dev ... bump version to v0.21.0	2018-08-12 12:10:16 +08:00
fatedier	fb13774457	version to v0.21.0	2018-08-12 12:04:12 +08:00
fatedier	f14ed87b29	Merge pull request #886 from fatedier/websocket ... Connect protocol support websocket	2018-08-10 16:36:02 +08:00
fatedier	07623027bc	websocket: fix	2018-08-10 16:31:49 +08:00
fatedier	941ac25648	fix ci	2018-08-10 12:02:38 +08:00
fatedier	f645082d72	vendor: add package golang.org/x/net/websocket	2018-08-10 11:49:33 +08:00
fatedier	7793f55545	websocket: update muxer for websocket	2018-08-10 11:45:48 +08:00
fatedier	ca88b07ecf	optimize	2018-08-08 11:18:38 +08:00
fatedier	6e305db4be	Merge pull request #882 from 235832289/master ... Fix the problem of long connection for more than 30 seconds and disconnection of the server	2018-08-08 11:03:08 +08:00
itcode	9bb08396c7	Fix the problem of long connection for more than 30 seconds and disconnection of the server	2018-08-08 10:52:08 +08:00
fatedier	64136a3b3e	Merge pull request #875 from jettyu/jettyu-websocket ... websocket protocol	2018-08-06 15:20:09 +08:00
FishFish	b8037475ed	websocket protocol	2018-08-05 12:55:31 +08:00
fatedier	b6c219aa97	Merge pull request #814 from neohe/dev ... update xtcp log info	2018-06-08 22:51:12 +08:00
Neo He	bbc36be052	update xtcp log info	2018-06-08 21:27:58 +08:00
fatedier	f5778349d5	config: fix server_name not using user as prefix, fix #804	2018-06-08 14:44:19 +08:00
fatedier	71603c6d0b	Merge pull request #807 from kac-/allowPorts ... cmd: frps: allow_ports option	2018-06-08 10:52:05 +08:00
kac-	e64fcce417	cmd: frps: allow_ports option	2018-06-06 18:25:55 +02:00
fatedier	629f2856b1	Merge pull request #801 from fatedier/dev ... bump version v0.20.0	2018-06-01 00:15:22 +08:00
fatedier	aeb9f2b64d	update golib	2018-05-29 02:08:41 +08:00
fatedier	85dd41c17b	Merge pull request #795 from fatedier/lb ... support lb	2018-05-26 22:42:03 +08:00
fatedier	102408d37f	doc: load balancing	2018-05-26 02:28:13 +08:00
fatedier	495b577819	update group ci	2018-05-23 14:39:12 +08:00
fatedier	f56b49ad3b	new feature: load balancing for tcp proxy	2018-05-22 23:59:35 +08:00
fatedier	cb1bf71bef	Merge pull request #787 from lonwern/arm64 ... build linux_arm64 package	2018-05-21 21:43:16 +08:00
fatedier	b9f062bef2	support lb	2018-05-21 21:22:10 +08:00
fatedier	490019fb51	update vendor, fix #788	2018-05-21 21:09:18 +08:00
fatedier	2e497274ba	add ci for setting headers	2018-05-20 23:55:22 +08:00
fatedier	cf4136fe99	Merge pull request #786 from fatedier/header ... support setting headers in http request	2018-05-20 23:44:19 +08:00
fatedier	b1e9cff622	doc: about headers	2018-05-20 23:41:15 +08:00
fatedier	db2d1fce76	http: support setting headers	2018-05-20 23:22:07 +08:00
lonwern	8579de9d3f	build linux_arm64 package	2018-05-20 23:05:29 +08:00
fatedier	0c35273759	Merge pull request #783 from fatedier/stcp ... frps dashboard add stcp	2018-05-20 19:09:43 +08:00
fatedier	6eb8146334	frps dashboard add stcp	2018-05-20 19:06:05 +08:00
fatedier	da78e3f52e	Merge pull request #781 from fatedier/dev ... bump version to 0.19.1	2018-05-19 23:10:17 +08:00
fatedier	e1918f6396	frps add '-t' to set token	2018-05-18 10:58:08 +08:00
fatedier	ad1e32fd2d	fix panic error when vhost_http_port is not set but there is a http ... proxy, fix #776	2018-05-18 00:21:11 +08:00
fatedier	3726f99b04	fix ci	2018-05-17 00:44:53 +08:00
fatedier	c8a7405992	version to 0.19.1	2018-05-17 00:17:22 +08:00
fatedier	040d198e36	Merge pull request #773 from fatedier/nat ... return error quickly if nathole make error	2018-05-17 00:10:53 +08:00
fatedier	1a6cbbb2d2	return error quickly if nathole make error	2018-05-17 00:07:56 +08:00
fatedier	ea79e03bd0	Merge pull request #772 from fatedier/web ... update dashboard ui	2018-05-16 23:56:12 +08:00
fatedier	3e349455a0	commands for xtcp, stcp add 'bind_port', fix #767	2018-05-16 23:45:44 +08:00
fatedier	c7a457a045	update web assets	2018-05-16 03:34:43 +08:00