lzc256
/
tailscale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

net/tshttpproxy: call winhttp calls from a fixed OS thread 

We often see things in logs like:

2021-03-02 17:52:45.2456258 +0800 +0800: winhttp: Open: The parameter is incorrect.
2021-03-02 17:52:45.2506261 +0800 +0800: tshttpproxy: winhttp: GetProxyForURL("https://log.tailscale.io/c/tailnode.log.tailscale.io/5037bb42f4bc330e2d6143e191a7ff7e837c6be538139231de69a439536e0d68"): ERROR_INVALID_PARAMETER [unexpected]

I have a hunch that WinHTTP has thread-local state. If so, this would fix it.
If not, this is pretty harmless.

Signed-off-by: Brad Fitzpatrick <bradfitz@tailscale.com>
pull/1446/head
Brad Fitzpatrick 2021-03-02 14:23:14 -08:00 committed by Brad Fitzpatrick
parent 061422affc
commit 10f48087f4
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
net/tshttpproxy/tshttpproxy_windows.go
View File

@ -11,6 +11,7 @@ import (
"log" "log"
"net/http" "net/http"
"net/url" "net/url"
"runtime"
"strings" "strings"
"sync" "sync"
"syscall" "syscall"
@ -109,6 +110,9 @@ func proxyFromWinHTTPOrCache(req *http.Request) (*url.URL, error) {
} }
func proxyFromWinHTTP(ctx context.Context, urlStr string) (proxy *url.URL, err error) { func proxyFromWinHTTP(ctx context.Context, urlStr string) (proxy *url.URL, err error) {
runtime.LockOSThread()
defer runtime.UnlockOSThread()
whi, err := winHTTPOpen() whi, err := winHTTPOpen()
if err != nil { if err != nil {
proxyErrorf("winhttp: Open: %v", err) proxyErrorf("winhttp: Open: %v", err)