From ca5c6798806546180994ab7c08e60a5ffeb69394 Mon Sep 17 00:00:00 2001 From: Success Go Date: Fri, 28 Feb 2020 10:30:48 +0800 Subject: Fix typos (#3087) * Fix typo * Fix typo, thanks for Spell Checker under VS Code --- caddyconfig/caddyfile/parse_test.go | 4 ++-- caddyconfig/httpcaddyfile/addresses.go | 2 +- caddyconfig/httpcaddyfile/httptype.go | 6 +++--- context.go | 2 +- modules/caddyhttp/encode/encode.go | 2 +- modules/caddyhttp/fileserver/matcher.go | 2 +- modules/caddyhttp/matchers.go | 2 +- modules/caddyhttp/reverseproxy/fastcgi/caddyfile.go | 2 +- modules/caddyhttp/reverseproxy/hosts.go | 2 +- modules/caddyhttp/templates/templates.go | 2 +- modules/caddytls/acmemanager.go | 2 +- 11 files changed, 14 insertions(+), 14 deletions(-) diff --git a/caddyconfig/caddyfile/parse_test.go b/caddyconfig/caddyfile/parse_test.go index 62a3998..e6d0501 100755 --- a/caddyconfig/caddyfile/parse_test.go +++ b/caddyconfig/caddyfile/parse_test.go @@ -256,7 +256,7 @@ func TestRecursiveImport(t *testing.T) { return false } if len(got.Segments[0]) != 1 || len(got.Segments[1]) != 2 { - t.Errorf("got unexpect tokens: %v", got.Segments) + t.Errorf("got unexpected tokens: %v", got.Segments) return false } return true @@ -351,7 +351,7 @@ func TestDirectiveImport(t *testing.T) { return false } if len(got.Segments[0]) != 1 || len(got.Segments[1]) != 8 { - t.Errorf("got unexpect tokens: %v", got.Segments) + t.Errorf("got unexpected tokens: %v", got.Segments) return false } return true diff --git a/caddyconfig/httpcaddyfile/addresses.go b/caddyconfig/httpcaddyfile/addresses.go index 19ac197..77f7e4f 100644 --- a/caddyconfig/httpcaddyfile/addresses.go +++ b/caddyconfig/httpcaddyfile/addresses.go @@ -45,7 +45,7 @@ import ( // key of its server block (specifying the host part), and each key may have // a different port. And we definitely need to be sure that a site which is // bound to be served on a specific interface is not served on others just -// beceause that is more convenient: it would be a potential security risk +// because that is more convenient: it would be a potential security risk // if the difference between interfaces means private vs. public. // // So what this function does for the example above is iterate each server diff --git a/caddyconfig/httpcaddyfile/httptype.go b/caddyconfig/httpcaddyfile/httptype.go index 8dda183..cfb3121 100644 --- a/caddyconfig/httpcaddyfile/httptype.go +++ b/caddyconfig/httpcaddyfile/httptype.go @@ -972,12 +972,12 @@ func sliceContains(haystack []string, needle string) bool { return false } -// specifity returns len(s) minus any wildcards (*) and +// specificity returns len(s) minus any wildcards (*) and // placeholders ({...}). Basically, it's a length count // that penalizes the use of wildcards and placeholders. // This is useful for comparing hostnames and paths. // However, wildcards in paths are not a sure answer to -// the question of specificity. For exmaple, +// the question of specificity. For example, // '*.example.com' is clearly less specific than // 'a.example.com', but is '/a' more or less specific // than '/a*'? @@ -1018,7 +1018,7 @@ type namedCustomLog struct { log *caddy.CustomLog } -// sbAddrAssocation is a mapping from a list of +// sbAddrAssociation is a mapping from a list of // addresses to a list of server blocks that are // served on those addresses. type sbAddrAssociation struct { diff --git a/context.go b/context.go index d64880c..68d31da 100644 --- a/context.go +++ b/context.go @@ -211,7 +211,7 @@ func (ctx Context) LoadModule(structPointer interface{}, fieldName string) (inte } // loadModulesFromSomeMap loads modules from val, which must be a type of map[string]interface{}. -// Depending on inlineModuleKey, it will be interpeted as either a ModuleMap (key is the module +// Depending on inlineModuleKey, it will be interpreted as either a ModuleMap (key is the module // name) or as a regular map (key is not the module name, and module name is defined inline). func (ctx Context) loadModulesFromSomeMap(namespace, inlineModuleKey string, val reflect.Value) (map[string]interface{}, error) { // if no inline_key is specified, then val must be a ModuleMap, diff --git a/modules/caddyhttp/encode/encode.go b/modules/caddyhttp/encode/encode.go index c3a1c23..52205aa 100644 --- a/modules/caddyhttp/encode/encode.go +++ b/modules/caddyhttp/encode/encode.go @@ -282,7 +282,7 @@ func acceptedEncodings(r *http.Request) []string { } // encodings with q-factor of 0 are not accepted; - // use a small theshold to account for float precision + // use a small threshold to account for float precision if qFactor < 0.00001 { continue } diff --git a/modules/caddyhttp/fileserver/matcher.go b/modules/caddyhttp/fileserver/matcher.go index ed5c102..1915fb7 100644 --- a/modules/caddyhttp/fileserver/matcher.go +++ b/modules/caddyhttp/fileserver/matcher.go @@ -51,7 +51,7 @@ type MatchFile struct { Root string `json:"root,omitempty"` // The list of files to try. Each path here is - // considered relatice to Root. If nil, the request + // considered related to Root. If nil, the request // URL's path will be assumed. Files and // directories are treated distinctly, so to match // a directory, the filepath MUST end in a forward diff --git a/modules/caddyhttp/matchers.go b/modules/caddyhttp/matchers.go index 3c357c6..6b57ead 100644 --- a/modules/caddyhttp/matchers.go +++ b/modules/caddyhttp/matchers.go @@ -680,7 +680,7 @@ func (m MatchRemoteIP) Match(r *http.Request) bool { return false } -// MatchRegexp is an embeddable type for matching +// MatchRegexp is an embedable type for matching // using regular expressions. It adds placeholders // to the request's replacer. type MatchRegexp struct { diff --git a/modules/caddyhttp/reverseproxy/fastcgi/caddyfile.go b/modules/caddyhttp/reverseproxy/fastcgi/caddyfile.go index 8c9fd38..7a65428 100644 --- a/modules/caddyhttp/reverseproxy/fastcgi/caddyfile.go +++ b/modules/caddyhttp/reverseproxy/fastcgi/caddyfile.go @@ -105,7 +105,7 @@ func (t *Transport) UnmarshalCaddyfile(d *caddyfile.Dispenser) error { // } // // Thus, this directive produces multiple handlers, each with a different -// matcher because multiple consecutive hgandlers are necessary to support +// matcher because multiple consecutive handlers are necessary to support // the common PHP use case. If this "common" config is not compatible // with a user's PHP requirements, they can use a manual approach based // on the example above to configure it precisely as they need. diff --git a/modules/caddyhttp/reverseproxy/hosts.go b/modules/caddyhttp/reverseproxy/hosts.go index 54de5a8..602aab2 100644 --- a/modules/caddyhttp/reverseproxy/hosts.go +++ b/modules/caddyhttp/reverseproxy/hosts.go @@ -27,7 +27,7 @@ import ( // Host represents a remote host which can be proxied to. // Its methods must be safe for concurrent use. type Host interface { - // NumRequests returns the numnber of requests + // NumRequests returns the number of requests // currently in process with the host. NumRequests() int diff --git a/modules/caddyhttp/templates/templates.go b/modules/caddyhttp/templates/templates.go index 94764bf..cf0908d 100644 --- a/modules/caddyhttp/templates/templates.go +++ b/modules/caddyhttp/templates/templates.go @@ -254,7 +254,7 @@ func (t *Templates) ServeHTTP(w http.ResponseWriter, r *http.Request, next caddy rec.Header().Del("Accept-Ranges") // we don't know ranges for dynamically-created content rec.Header().Del("Last-Modified") // useless for dynamic content since it's always changing - // we don't know a way to guickly generate etag for dynamic content, + // we don't know a way to quickly generate etag for dynamic content, // and weak etags still cause browsers to rely on it even after a // refresh, so disable them until we find a better way to do this rec.Header().Del("Etag") diff --git a/modules/caddytls/acmemanager.go b/modules/caddytls/acmemanager.go index df73545..bf80a06 100644 --- a/modules/caddytls/acmemanager.go +++ b/modules/caddytls/acmemanager.go @@ -229,7 +229,7 @@ func onDemandAskRequest(ask string, name string) error { resp, err := onDemandAskClient.Get(askURL.String()) if err != nil { - return fmt.Errorf("error checking %v to deterine if certificate for hostname '%s' should be allowed: %v", + return fmt.Errorf("error checking %v to determine if certificate for hostname '%s' should be allowed: %v", ask, name, err) } resp.Body.Close() -- cgit v1.2.3