guoswork/frp
1
0
Fork 0
mirror of https://gitee.com/IrisVega/frp.git synced 2024-11-01 22:31:29 +08:00
Code Issues Packages Projects Releases Wiki Activity

typo

Browse Source
This commit is contained in:
fatedier 2016-09-06 17:56:09 +08:00
parent 8c497793c5
commit adcb2c1ea5
4 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
conf/frpc.ini
View File

@ -36,6 +36,10 @@ local_ip = 127.0.0.1
local_port = 80 local_port = 80
use_gzip = true use_gzip = true
pool_count = 20 pool_count = 20
# http username and password are safety certification for http protoc
# if not set, you can access this custom_domains without certification
http_username = admin
http_password = admin
[web02] [web02]
type = http type = http

5
conf/frps.ini
View File

@ -41,11 +41,6 @@ auth_token = 123
# if proxy type equals http, custom_domains must be set separated by commas # if proxy type equals http, custom_domains must be set separated by commas
custom_domains = web01.yourdomain.com,web01.yourdomain2.com custom_domains = web01.yourdomain.com,web01.yourdomain2.com
# http username and password are safety certification for http protoc
# if not set, you can access this custom_domains without certification
http_username = admin
http_password = admin
[web02] [web02]
# if type equals https, vhost_https_port must be set # if type equals https, vhost_https_port must be set
type = https type = https

4
src/models/client/config.go
View File

@ -156,12 +156,12 @@ func LoadConf(confFile string) (err error) {
if ok { if ok {
proxyClient.HostHeaderRewrite = tmpStr proxyClient.HostHeaderRewrite = tmpStr
} }
//http_username // http_username
tmpStr, ok = section["http_username"] tmpStr, ok = section["http_username"]
if ok { if ok {
proxyClient.HttpUserName = tmpStr proxyClient.HttpUserName = tmpStr
} }
//http_password // http_password
tmpStr, ok = section["http_password"] tmpStr, ok = section["http_password"]
if ok { if ok {
proxyClient.HttpPassWord = tmpStr proxyClient.HttpPassWord = tmpStr

3
src/models/server/server.go
View File

@ -90,8 +90,7 @@ func (p *ProxyServer) Init() {
func (p *ProxyServer) Compare(p2 *ProxyServer) bool { func (p *ProxyServer) Compare(p2 *ProxyServer) bool {
if p.Name != p2.Name || p.AuthToken != p2.AuthToken || p.Type != p2.Type || if p.Name != p2.Name || p.AuthToken != p2.AuthToken || p.Type != p2.Type ||
p.BindAddr != p2.BindAddr || p.ListenPort != p2.ListenPort || p.HostHeaderRewrite != p2.HostHeaderRewrite || p.BindAddr != p2.BindAddr || p.ListenPort != p2.ListenPort || p.HostHeaderRewrite != p2.HostHeaderRewrite {
p.HttpUserName != p2.HttpUserName || p.HttpPassWord != p2.HttpPassWord {
return false return false
} }
if len(p.CustomDomains) != len(p2.CustomDomains) { if len(p.CustomDomains) != len(p2.CustomDomains) {