Browse Source

`go get` and commit the websocket fork

tags/v2.6.0-rc1
Shivaram Lingamneni 3 years ago
parent
commit
f05c57344e
3 changed files with 6 additions and 3 deletions
  1. 2
    0
      go.sum
  2. 2
    2
      vendor/github.com/gorilla/websocket/server.go
  3. 2
    1
      vendor/modules.txt

+ 2
- 0
go.sum View File

@@ -52,6 +52,8 @@ github.com/oragono/confusables v0.0.0-20201108231250-4ab98ab61fb1 h1:Y87UllAzZJf
52 52
 github.com/oragono/confusables v0.0.0-20201108231250-4ab98ab61fb1/go.mod h1:+uesPRay9e5tW6zhw4CJkRV3QOEbbZIJcsuo9ZnC+hE=
53 53
 github.com/oragono/go-ident v0.0.0-20200511222032-830550b1d775 h1:AMAsAn/i4AgsmWQYdMoze9omwtHpbxrKuT+AT1LmhtI=
54 54
 github.com/oragono/go-ident v0.0.0-20200511222032-830550b1d775/go.mod h1:r5Fk840a4eu3ii1kxGDNSJupQu9Z1UC1nfJOZZXC24c=
55
+github.com/oragono/websocket v1.4.2-oragono1 h1:YcbddwFMNDTK+1pQfLq/HIvKe5NPLgl8NFefQUPJZCA=
56
+github.com/oragono/websocket v1.4.2-oragono1/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
55 57
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
56 58
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
57 59
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=

+ 2
- 2
vendor/github.com/gorilla/websocket/server.go View File

@@ -99,8 +99,8 @@ func checkSameOrigin(r *http.Request) bool {
99 99
 func (u *Upgrader) selectSubprotocol(r *http.Request, responseHeader http.Header) string {
100 100
 	if u.Subprotocols != nil {
101 101
 		clientProtocols := Subprotocols(r)
102
-		for _, serverProtocol := range u.Subprotocols {
103
-			for _, clientProtocol := range clientProtocols {
102
+		for _, clientProtocol := range clientProtocols {
103
+			for _, serverProtocol := range u.Subprotocols {
104 104
 				if clientProtocol == serverProtocol {
105 105
 					return clientProtocol
106 106
 				}

+ 2
- 1
vendor/modules.txt View File

@@ -18,7 +18,7 @@ github.com/docopt/docopt-go
18 18
 github.com/go-sql-driver/mysql
19 19
 # github.com/go-test/deep v1.0.6
20 20
 ## explicit
21
-# github.com/gorilla/websocket v1.4.2
21
+# github.com/gorilla/websocket v1.4.2 => github.com/oragono/websocket v1.4.2-oragono1
22 22
 ## explicit
23 23
 github.com/gorilla/websocket
24 24
 # github.com/goshuirc/irc-go v0.0.0-20210301225436-2c4b83d64847
@@ -90,3 +90,4 @@ golang.org/x/text/width
90 90
 # gopkg.in/yaml.v2 v2.3.0
91 91
 ## explicit
92 92
 gopkg.in/yaml.v2
93
+# github.com/gorilla/websocket => github.com/oragono/websocket v1.4.2-oragono1

Loading…
Cancel
Save