aboutsummaryrefslogtreecommitdiff
path: root/src/net/http
diff options
context:
space:
mode:
authorDaniel Martí <mvdan@mvdan.cc>2022-04-07 15:13:47 +0900
committerDaniel Martí <mvdan@mvdan.cc>2022-04-08 13:44:41 +0000
commit3e7ffb862f550c38ce0611b970a4dce10a01226e (patch)
tree8d7956973a91916502a4181265788ececc562841 /src/net/http
parent5a90270d7f5b384de31399133c7336d007fbd93d (diff)
downloadgo-3e7ffb862f550c38ce0611b970a4dce10a01226e.tar.xz
all: consistently use US spelling of present participles
It has been agreed that we should prefer the US spelling of words like "canceling" over "cancelling"; for example, see https://go.dev/cl/14526. Fix a few occurrences of the "canceling" inconsistency, as well as: * signaling * tunneling * marshaling Change-Id: I99f3ba0a700a9f0292bc6c1b110af31dd05f1ff0 Reviewed-on: https://go-review.googlesource.com/c/go/+/398734 Trust: Daniel Martí <mvdan@mvdan.cc> Run-TryBot: Daniel Martí <mvdan@mvdan.cc> TryBot-Result: Gopher Robot <gobot@golang.org> Reviewed-by: Ian Lance Taylor <iant@golang.org>
Diffstat (limited to 'src/net/http')
-rw-r--r--src/net/http/fcgi/fcgi_test.go8
-rw-r--r--src/net/http/server.go2
2 files changed, 5 insertions, 5 deletions
diff --git a/src/net/http/fcgi/fcgi_test.go b/src/net/http/fcgi/fcgi_test.go
index 5888783620..7a344ff31d 100644
--- a/src/net/http/fcgi/fcgi_test.go
+++ b/src/net/http/fcgi/fcgi_test.go
@@ -401,16 +401,16 @@ func TestResponseWriterSniffsContentType(t *testing.T) {
}
}
-type signallingNopCloser struct {
+type signalingNopCloser struct {
io.Reader
closed chan bool
}
-func (*signallingNopCloser) Write(buf []byte) (int, error) {
+func (*signalingNopCloser) Write(buf []byte) (int, error) {
return len(buf), nil
}
-func (rc *signallingNopCloser) Close() error {
+func (rc *signalingNopCloser) Close() error {
close(rc.closed)
return nil
}
@@ -429,7 +429,7 @@ func TestSlowRequest(t *testing.T) {
}
}(pw)
- rc := &signallingNopCloser{pr, make(chan bool)}
+ rc := &signalingNopCloser{pr, make(chan bool)}
handlerDone := make(chan bool)
c := newChild(rc, http.HandlerFunc(func(
diff --git a/src/net/http/server.go b/src/net/http/server.go
index bd4ef1bacc..77e0108426 100644
--- a/src/net/http/server.go
+++ b/src/net/http/server.go
@@ -1721,7 +1721,7 @@ type closeWriter interface {
var _ closeWriter = (*net.TCPConn)(nil)
// closeWrite flushes any outstanding data and sends a FIN packet (if
-// client is connected via TCP), signalling that we're done. We then
+// client is connected via TCP), signaling that we're done. We then
// pause for a bit, hoping the client processes it before any
// subsequent RST.
//