From a190e2b71aa3109ee58695dbf2009f1751309505 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 1 Jan 2025 05:16:50 +0000 Subject: [PATCH] Bump golang.org/x/net in /rss_generator in the go-modules-updates group Bumps the go-modules-updates group in /rss_generator with 1 update: [golang.org/x/net](https://github.com/golang/net). Updates `golang.org/x/net` from 0.31.0 to 0.33.0 - [Commits](https://github.com/golang/net/compare/v0.31.0...v0.33.0) --- updated-dependencies: - dependency-name: golang.org/x/net dependency-type: direct:production update-type: version-update:semver-minor dependency-group: go-modules-updates ... Signed-off-by: dependabot[bot] --- rss_generator/go.mod | 2 +- rss_generator/go.sum | 4 ++-- rss_generator/vendor/golang.org/x/net/html/doctype.go | 2 +- rss_generator/vendor/golang.org/x/net/html/foreign.go | 3 +-- rss_generator/vendor/golang.org/x/net/html/parse.go | 8 ++++++-- rss_generator/vendor/modules.txt | 2 +- 6 files changed, 12 insertions(+), 9 deletions(-) diff --git a/rss_generator/go.mod b/rss_generator/go.mod index 245a337c..0bc565a0 100644 --- a/rss_generator/go.mod +++ b/rss_generator/go.mod @@ -8,7 +8,7 @@ require ( github.com/russross/blackfriday/v2 v2.1.0 github.com/stretchr/testify v1.10.0 github.com/umputun/go-flags v1.5.1 - golang.org/x/net v0.31.0 + golang.org/x/net v0.33.0 ) require ( diff --git a/rss_generator/go.sum b/rss_generator/go.sum index 034054d7..9791f453 100644 --- a/rss_generator/go.sum +++ b/rss_generator/go.sum @@ -12,8 +12,8 @@ github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOf github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/umputun/go-flags v1.5.1 h1:vRauoXV3Ultt1HrxivSxowbintgZLJE+EcBy5ta3/mY= github.com/umputun/go-flags v1.5.1/go.mod h1:nTbvsO/hKqe7Utri/NoyN18GR3+EWf+9RrmsdwdhrEc= -golang.org/x/net v0.31.0 h1:68CPQngjLL0r2AlUKiSxtQFKvzRVbnzLwMUn5SzcLHo= -golang.org/x/net v0.31.0/go.mod h1:P4fl1q7dY2hnZFxEk4pPSkDHF+QqjitcnDjUQyMM+pM= +golang.org/x/net v0.33.0 h1:74SYHlV8BIgHIFC/LrYkOGIwL19eTYXQ5wc6TBuO36I= +golang.org/x/net v0.33.0/go.mod h1:HXLR5J+9DxmrqMwG9qjGCxZ+zKXxBru04zlTvWlWuN4= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= diff --git a/rss_generator/vendor/golang.org/x/net/html/doctype.go b/rss_generator/vendor/golang.org/x/net/html/doctype.go index c484e5a9..bca3ae9a 100644 --- a/rss_generator/vendor/golang.org/x/net/html/doctype.go +++ b/rss_generator/vendor/golang.org/x/net/html/doctype.go @@ -87,7 +87,7 @@ func parseDoctype(s string) (n *Node, quirks bool) { } } if lastAttr := n.Attr[len(n.Attr)-1]; lastAttr.Key == "system" && - strings.ToLower(lastAttr.Val) == "http://www.ibm.com/data/dtd/v11/ibmxhtml1-transitional.dtd" { + strings.EqualFold(lastAttr.Val, "http://www.ibm.com/data/dtd/v11/ibmxhtml1-transitional.dtd") { quirks = true } } diff --git a/rss_generator/vendor/golang.org/x/net/html/foreign.go b/rss_generator/vendor/golang.org/x/net/html/foreign.go index 9da9e9dc..e8515d8e 100644 --- a/rss_generator/vendor/golang.org/x/net/html/foreign.go +++ b/rss_generator/vendor/golang.org/x/net/html/foreign.go @@ -40,8 +40,7 @@ func htmlIntegrationPoint(n *Node) bool { if n.Data == "annotation-xml" { for _, a := range n.Attr { if a.Key == "encoding" { - val := strings.ToLower(a.Val) - if val == "text/html" || val == "application/xhtml+xml" { + if strings.EqualFold(a.Val, "text/html") || strings.EqualFold(a.Val, "application/xhtml+xml") { return true } } diff --git a/rss_generator/vendor/golang.org/x/net/html/parse.go b/rss_generator/vendor/golang.org/x/net/html/parse.go index 46a89eda..643c674e 100644 --- a/rss_generator/vendor/golang.org/x/net/html/parse.go +++ b/rss_generator/vendor/golang.org/x/net/html/parse.go @@ -840,6 +840,10 @@ func afterHeadIM(p *parser) bool { p.parseImpliedToken(StartTagToken, a.Body, a.Body.String()) p.framesetOK = true + if p.tok.Type == ErrorToken { + // Stop parsing. + return true + } return false } @@ -1031,7 +1035,7 @@ func inBodyIM(p *parser) bool { if p.tok.DataAtom == a.Input { for _, t := range p.tok.Attr { if t.Key == "type" { - if strings.ToLower(t.Val) == "hidden" { + if strings.EqualFold(t.Val, "hidden") { // Skip setting framesetOK = false return true } @@ -1459,7 +1463,7 @@ func inTableIM(p *parser) bool { return inHeadIM(p) case a.Input: for _, t := range p.tok.Attr { - if t.Key == "type" && strings.ToLower(t.Val) == "hidden" { + if t.Key == "type" && strings.EqualFold(t.Val, "hidden") { p.addElement() p.oe.pop() return true diff --git a/rss_generator/vendor/modules.txt b/rss_generator/vendor/modules.txt index 113169ca..103f49d6 100644 --- a/rss_generator/vendor/modules.txt +++ b/rss_generator/vendor/modules.txt @@ -22,7 +22,7 @@ github.com/stretchr/testify/require # github.com/umputun/go-flags v1.5.1 ## explicit; go 1.12 github.com/umputun/go-flags -# golang.org/x/net v0.31.0 +# golang.org/x/net v0.33.0 ## explicit; go 1.18 golang.org/x/net/html golang.org/x/net/html/atom