Merge pull request #153 from Loyalsoldier/minor-fixes

Minor fixes
v2fly · Sep 2, 2020 · 971c5f2 · 971c5f2
2 parents 4da3304 + 323ef03
commit 971c5f2
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/app/dns/server.go b/app/dns/server.go
@@ -114,8 +114,7 @@ func New(ctx context.Context, config *Config) (*Server, error) {
 				log.Fatalln(newError("DNS config error").Base(err))
 			}
 			server.clients = append(server.clients, NewDoHLocalNameServer(u, server.clientIP))
-		} else if address.Family().IsDomain() &&
-			strings.HasPrefix(address.Domain(), "https://") {
+		} else if address.Family().IsDomain() && strings.HasPrefix(address.Domain(), "https://") {
 			// DOH Remote mode
 			u, err := url.Parse(address.Domain())
 			if err != nil {

diff --git a/common/strmatcher/strmatcher.go b/common/strmatcher/strmatcher.go
@@ -49,7 +49,7 @@ func (t Type) New(pattern string) (Matcher, error) {
 
 // IndexMatcher is the interface for matching with a group of matchers.
 type IndexMatcher interface {
-	// Match returns the the index of a matcher that matches the input. It returns empty array if no such matcher exists.
+	// Match returns the index of a matcher that matches the input. It returns empty array if no such matcher exists.
 	Match(input string) []uint32
 }