Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit4090240

Browse files
committed
chore: update tailscale to fix http2 upgrade
Seecoder/tailscale#15
1 parentb71b8da commit4090240

File tree

3 files changed

+5
-8
lines changed

3 files changed

+5
-8
lines changed

‎go.mod

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ replace github.com/tcnksm/go-httpstat => github.com/kylecarbs/go-httpstat v0.0.0
4040

4141
// There are a few minor changes we make to Tailscale that we're slowly upstreaming. Compare here:
4242
// https://github.com/tailscale/tailscale/compare/main...coder:tailscale:main
43-
replacetailscale.com =>github.com/coder/tailscalev1.1.1-0.20230321171725-fed359a0cafa
43+
replacetailscale.com =>github.com/coder/tailscalev1.1.1-0.20230323204624-bf5761af4a29
4444

4545
// Switch to our fork that imports fixes from http://github.com/tailscale/ssh.
4646
// See: https://github.com/coder/coder/issues/3371
@@ -60,7 +60,6 @@ require (
6060
github.com/AlecAivazis/survey/v2v2.3.5
6161
github.com/acarl005/stripansiv0.0.0-20180116102854-5a71ef0e047d
6262
github.com/adrg/xdgv0.4.0
63-
github.com/ammario/prefixsuffixv0.0.0-20200405191514-5a0456bf2cfd
6463
github.com/andybalholm/brotliv1.0.4
6564
github.com/armon/circbufv0.0.0-20190214190532-5111143e8da2
6665
github.com/awalterschulze/gographvizv2.0.3+incompatible
@@ -162,7 +161,6 @@ require (
162161
golang.org/x/syncv0.1.0
163162
golang.org/x/sysv0.5.0
164163
golang.org/x/termv0.5.0
165-
golang.org/x/textv0.7.0
166164
golang.org/x/toolsv0.6.0
167165
golang.org/x/xerrorsv0.0.0-20220907171357-04be3eba64a2
168166
golang.zx2c4.com/wireguardv0.0.0-20230223181233-21636207a675
@@ -193,6 +191,7 @@ require (
193191
github.com/modern-go/concurrentv0.0.0-20180306012644-bacd9c7ef1dd// indirect
194192
github.com/modern-go/reflect2v1.0.2// indirect
195193
github.com/muesli/cancelreaderv0.2.2// indirect
194+
golang.org/x/textv0.7.0// indirect
196195
golang.zx2c4.com/wireguard/wgctrlv0.0.0-20230215201556-9c5414ab4bde// indirect
197196
)
198197

‎go.sum

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -193,8 +193,6 @@ github.com/alexbrainman/sspi v0.0.0-20210105120005-909beea2cc74/go.mod h1:cEWa1L
193193
github.com/alexflint/go-filemutexv0.0.0-20171022225611-72bdc8eae2ae/go.mod h1:CgnQgUtFrFz9mxFNtED3jI5tLDjKlOM+oUF/sTk6ps0=
194194
github.com/alexflint/go-filemutexv1.1.0/go.mod h1:7P4iRhttt/nUvUOrYIhcpMzv2G6CY9UnI16Z+UJqRyk=
195195
github.com/alexkohler/preallocv1.0.0/go.mod h1:VetnK3dIgFBBKmg0YnD9F9x6Icjd+9cvfHR56wJVlKE=
196-
github.com/ammario/prefixsuffixv0.0.0-20200405191514-5a0456bf2cfd h1:WOzjyD34+0vVw3wzE7js8Yvzo08ljzvK1jG6wL8elVU=
197-
github.com/ammario/prefixsuffixv0.0.0-20200405191514-5a0456bf2cfd/go.mod h1:VM1c/0Tl3O26UkHMbU32VFqLwLvi2FA40b6s5vPOpoo=
198196
github.com/andreyvit/diffv0.0.0-20170406064948-c7f18ee00883 h1:bvNMNQO63//z+xNgfBlViaCIJKLlCJ6/fmUseuG0wVQ=
199197
github.com/andybalholm/brotliv1.0.2/go.mod h1:loMXtMfwqflxFJPmdbJO0a3KNoPuLBgiu3qAvBg8x/Y=
200198
github.com/andybalholm/brotliv1.0.3/go.mod h1:fO7iG3H7G2nSZ7m0zPUDn85XEX2GTukHGRSepvi9Eig=
@@ -380,8 +378,8 @@ github.com/coder/retry v1.3.1-0.20230210155434-e90a2e1e091d h1:09JG37IgTB6n3ouX9
380378
github.com/coder/retryv1.3.1-0.20230210155434-e90a2e1e091d/go.mod h1:r+1J5i/989wt6CUeNSuvFKKA9hHuKKPMxdzDbTuvwwk=
381379
github.com/coder/sshv0.0.0-20220811105153-fcea99919338 h1:tN5GKFT68YLVzJoA8AHuiMNJ0qlhoD3pGN3JY9gxSko=
382380
github.com/coder/sshv0.0.0-20220811105153-fcea99919338/go.mod h1:ZSS+CUoKHDrqVakTfTWUlKSr9MtMFkC4UvtQKD7O914=
383-
github.com/coder/tailscalev1.1.1-0.20230321171725-fed359a0cafa h1:EjRGgTz7BUECmbV8jHTi1/rKdDjJESGSlm1Jp7evvCQ=
384-
github.com/coder/tailscalev1.1.1-0.20230321171725-fed359a0cafa/go.mod h1:jpg+77g19FpXL43U1VoIqoSg1K/Vh5CVxycGldQ8KhA=
381+
github.com/coder/tailscalev1.1.1-0.20230323204624-bf5761af4a29 h1:bZAOib5uT7ohTYcKKj8w5jH+HwBStBrZ/KcU26X0g+A=
382+
github.com/coder/tailscalev1.1.1-0.20230323204624-bf5761af4a29/go.mod h1:jpg+77g19FpXL43U1VoIqoSg1K/Vh5CVxycGldQ8KhA=
385383
github.com/coder/terraform-provider-coderv0.6.21 h1:TIH6+/VQFreT8q/CkRvpHtbIeM5cOAhuDS5Sh1Nm21Q=
386384
github.com/coder/terraform-provider-coderv0.6.21/go.mod h1:UIfU3bYNeSzJJvHyJ30tEKjD6Z9utloI+HUM/7n94CY=
387385
github.com/coder/wgtunnelv0.1.5 h1:WP3sCj/3iJ34eKvpMQEp1oJHvm24RYh0NHbj1kfUKfs=

‎tailnet/conn_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ func TestTailnet(t *testing.T) {
160160
node:=<-nodes
161161
require.Len(t,node.DERPForcedWebsocket,1)
162162
// Ensure the reason is valid!
163-
require.Equal(t,"GET failed with status code 400:Invalid\"Upgrade\" header: DERP",node.DERPForcedWebsocket[derpMap.RegionIDs()[0]])
163+
require.Equal(t,`GET failed with status code 400 (a proxy could be disallowing the use of 'Upgrade: derp'):Invalid "Upgrade" header: DERP`,node.DERPForcedWebsocket[derpMap.RegionIDs()[0]])
164164

165165
w1.Close()
166166
w2.Close()

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp