diff options
| author | Cuong Manh Le <cuong.manhle.vn@gmail.com> | 2023-08-26 08:08:30 +0700 |
|---|---|---|
| committer | Gopher Robot <gobot@golang.org> | 2023-08-26 03:35:20 +0000 |
| commit | ff00fdfdbeeb72ca8981a04290765452d6a31b26 (patch) | |
| tree | d34c1c46ac23b3d745865629a908304f39d32034 /src/net/http/cgi | |
| parent | 079c0441d548494fd23ec0083b6f22fb128ea52d (diff) | |
| download | go-ff00fdfdbeeb72ca8981a04290765452d6a31b26.tar.xz | |
Revert "net/http/cgi: workaround for closure inlining issue"
This reverts CL 522935.
Issue #62277 is fixed, the workaround can be dropped.
Updates #62277
Change-Id: I7c69e35248942b4d4fcdd81121051cca9b098980
Reviewed-on: https://go-review.googlesource.com/c/go/+/523175
Run-TryBot: Cuong Manh Le <cuong.manhle.vn@gmail.com>
TryBot-Result: Gopher Robot <gobot@golang.org>
Auto-Submit: Cuong Manh Le <cuong.manhle.vn@gmail.com>
Reviewed-by: Matthew Dempsky <mdempsky@google.com>
Reviewed-by: Dmitri Shuralyov <dmitshur@google.com>
Diffstat (limited to 'src/net/http/cgi')
| -rw-r--r-- | src/net/http/cgi/host.go | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/net/http/cgi/host.go b/src/net/http/cgi/host.go index a3fba4b413..073952a7bd 100644 --- a/src/net/http/cgi/host.go +++ b/src/net/http/cgi/host.go @@ -35,10 +35,7 @@ import ( var trailingPort = regexp.MustCompile(`:([0-9]+)$`) -var osDefaultInheritEnv = getOSDefaultInheritEnv() - -// TODO(mdempsky): Revert CL 522935 after #62277 is fixed. -func getOSDefaultInheritEnv() []string { +var osDefaultInheritEnv = func() []string { switch runtime.GOOS { case "darwin", "ios": return []string{"DYLD_LIBRARY_PATH"} @@ -54,7 +51,7 @@ func getOSDefaultInheritEnv() []string { return []string{"SystemRoot", "COMSPEC", "PATHEXT", "WINDIR"} } return nil -} +}() // Handler runs an executable in a subprocess with a CGI environment. type Handler struct { |