Merge remote-tracking branch 'upstream/master'

pypi · Jul 14, 2023 · 983b385 · 983b385
2 parents b5f718b + 18de011
commit 983b385
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/pkg/camo/proxy.go b/pkg/camo/proxy.go
@@ -170,7 +170,7 @@ func (p *Proxy) ServeHTTP(w http.ResponseWriter, req *http.Request) {
 
  if resp != nil {
  defer func() {
- if err:= resp.Body.Close(); err != nil {
+ if err := resp.Body.Close(); err != nil {
  if mlog.HasDebug() {
  mlog.Debug("error on body close. ignoring.")
  }

diff --git a/pkg/htrie/glob_path_chk.go b/pkg/htrie/glob_path_chk.go
@@ -47,11 +47,11 @@ func (gpc *GlobPathChecker) parseRule(rule string) (string, string, error) {
 // AddRule adds a rule to the GlobPathChecker.
 // The expected rule format is:
 //
-// <pipe-character><flags><pipe-character><match-url>
+// <pipe-character><flags><pipe-character><match-url>
 //
 // Example:
 //
-// |i|/some/subdir/*
+// |i|/some/subdir/*
 //
 // Allowed flags:
 //

diff --git a/pkg/htrie/htrie.go b/pkg/htrie/htrie.go
@@ -298,8 +298,7 @@ func (dt *URLMatcher) CheckURL(u *url.URL) bool {
 // sanitized, space trimmed, and lowercased...
 // Basically sanitized in a way similar to:
 //
-// strings.ToLower((*url.URL).Hostname())
-//
+// strings.ToLower((*url.URL).Hostname())
 func (dt *URLMatcher) CheckHostname(hostname string) bool {
  hostname = strings.ToLower(hostname)
  matches := dt.walkFind(hostname)