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>

diff --git a/src/net/http/cgi/host.go b/src/net/http/cgi/host.go
index a3fba4b41313456df8ec581b4d14e45431379b19..073952a7bd40f15bb75cba793c26537f55391923 100644 (file)
--- 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 {