From: cuiweixie Date: Wed, 28 Sep 2022 00:23:21 +0000 (+0800) Subject: net/http: use time.Compare X-Git-Tag: go1.20rc1~828 X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=879f595f7eacbd53d25fe21cac4b2b0cfde36449;p=gostls13.git net/http: use time.Compare Change-Id: I4730673130bdfbda9987dcb5869f421082f92150 Reviewed-on: https://go-review.googlesource.com/c/go/+/435615 Reviewed-by: Dmitri Shuralyov TryBot-Result: Gopher Robot Reviewed-by: Ian Lance Taylor Auto-Submit: Ian Lance Taylor Run-TryBot: Ian Lance Taylor --- diff --git a/src/net/http/cookiejar/jar.go b/src/net/http/cookiejar/jar.go index 097c93a137..3d0ad19af0 100644 --- a/src/net/http/cookiejar/jar.go +++ b/src/net/http/cookiejar/jar.go @@ -214,8 +214,8 @@ func (j *Jar) cookies(u *url.URL, now time.Time) (cookies []*http.Cookie) { if len(s[i].Path) != len(s[j].Path) { return len(s[i].Path) > len(s[j].Path) } - if !s[i].Creation.Equal(s[j].Creation) { - return s[i].Creation.Before(s[j].Creation) + if ret := s[i].Creation.Compare(s[j].Creation); ret != 0 { + return ret < 0 } return s[i].seqNum < s[j].seqNum }) diff --git a/src/net/http/fs.go b/src/net/http/fs.go index cf80018b5e..3feef8f2b0 100644 --- a/src/net/http/fs.go +++ b/src/net/http/fs.go @@ -431,7 +431,7 @@ func checkIfUnmodifiedSince(r *Request, modtime time.Time) condResult { // The Last-Modified header truncates sub-second precision so // the modtime needs to be truncated too. modtime = modtime.Truncate(time.Second) - if modtime.Before(t) || modtime.Equal(t) { + if ret := modtime.Compare(t); ret <= 0 { return condTrue } return condFalse @@ -482,7 +482,7 @@ func checkIfModifiedSince(r *Request, modtime time.Time) condResult { // The Last-Modified header truncates sub-second precision so // the modtime needs to be truncated too. modtime = modtime.Truncate(time.Second) - if modtime.Before(t) || modtime.Equal(t) { + if ret := modtime.Compare(t); ret <= 0 { return condFalse } return condTrue