From adcb2c1ea5989b1157ab28d2b38fee13314b8351 Mon Sep 17 00:00:00 2001
From: fatedier <fatedier@gmail.com>
Date: Tue, 6 Sep 2016 17:56:09 +0800
Subject: [PATCH] typo

---
 conf/frpc.ini               | 4 ++++
 conf/frps.ini               | 5 -----
 src/models/client/config.go | 4 ++--
 src/models/server/server.go | 3 +--
 4 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/conf/frpc.ini b/conf/frpc.ini
index 98517708..083f84f0 100644
--- a/conf/frpc.ini
+++ b/conf/frpc.ini
@@ -36,6 +36,10 @@ local_ip = 127.0.0.1
 local_port = 80
 use_gzip = true
 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]
 type = http
diff --git a/conf/frps.ini b/conf/frps.ini
index 45ec8586..6163bc98 100644
--- a/conf/frps.ini
+++ b/conf/frps.ini
@@ -41,11 +41,6 @@ auth_token = 123
 # if proxy type equals http, custom_domains must be set separated by commas
 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]
 # if type equals https, vhost_https_port must be set
 type = https
diff --git a/src/models/client/config.go b/src/models/client/config.go
index ca5ec5b7..417ea3b2 100644
--- a/src/models/client/config.go
+++ b/src/models/client/config.go
@@ -156,12 +156,12 @@ func LoadConf(confFile string) (err error) {
 				if ok {
 					proxyClient.HostHeaderRewrite = tmpStr
 				}
-				//http_username
+				// http_username
 				tmpStr, ok = section["http_username"]
 				if ok {
 					proxyClient.HttpUserName = tmpStr
 				}
-				//http_password
+				// http_password
 				tmpStr, ok = section["http_password"]
 				if ok {
 					proxyClient.HttpPassWord = tmpStr
diff --git a/src/models/server/server.go b/src/models/server/server.go
index 86019ea7..2e2618d5 100644
--- a/src/models/server/server.go
+++ b/src/models/server/server.go
@@ -90,8 +90,7 @@ func (p *ProxyServer) Init() {
 
 func (p *ProxyServer) Compare(p2 *ProxyServer) bool {
 	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.HttpUserName != p2.HttpUserName || p.HttpPassWord != p2.HttpPassWord {
+		p.BindAddr != p2.BindAddr || p.ListenPort != p2.ListenPort || p.HostHeaderRewrite != p2.HostHeaderRewrite {
 		return false
 	}
 	if len(p.CustomDomains) != len(p2.CustomDomains) {