XiaoMo/frp
1
0
Fork 0
mirror of https://github.com/fatedier/frp.git synced 2025-07-27 07:35:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix conflicts in fatedier/connection_pool with dev

Browse Source 
Conflicts:
	src/frp/cmd/frpc/control.go
	src/frp/cmd/frps/control.go
	src/frp/models/config/config.go
	src/frp/models/server/server.go
This commit is contained in:
fatedier
2016-07-29 23:38:34 +08:00
parent 8f5f0b0a9a 452e02adab
commit fd3c97a0e9
12 changed files with 229 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
conf/frpc.ini
View File

@@ -55,3 +55,4 @@ local_ip = 127.0.0.1
local_port = 80
use_gzip = true
custom_domains = web03.yourdomain.com
host_header_rewrite = example.com