diff options
| author | Nikhil Benesch <nikhil.benesch@gmail.com> | 2020-10-21 03:00:04 -0400 |
|---|---|---|
| committer | Ian Lance Taylor <iant@golang.org> | 2020-10-23 16:55:57 -0700 |
| commit | 27f7ab27d1a514eaf538ae01840b42c6d12cb28f (patch) | |
| tree | 564a0a1cc8fd82243a4410e55b5134006edcadeb /libgo | |
| parent | d835608f05471e749533c756ccdd9e166b819b68 (diff) | |
| download | gcc-27f7ab27d1a514eaf538ae01840b42c6d12cb28f.tar.gz | |
net/http/cgi: merge upstream changes to default env vars
Incorporate upstream modifications to the cgi package's set of rules
about which environment variables should be inherited by child processes
by default on each platform. In particular this permits tests to pass on
NetBSD by preserving the value of the LD_LIBRARY_PATH environment
variable.
This is a partial backport of the following upstream CLs:
https://golang.org/cl/263802
https://golang.org/cl/263577
https://golang.org/cl/254740
Reviewed-on: https://go-review.googlesource.com/c/gofrontend/+/264097
Diffstat (limited to 'libgo')
| -rw-r--r-- | libgo/go/net/http/cgi/host.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libgo/go/net/http/cgi/host.go b/libgo/go/net/http/cgi/host.go index 863f40638ab..eff67caf4e6 100644 --- a/libgo/go/net/http/cgi/host.go +++ b/libgo/go/net/http/cgi/host.go @@ -37,15 +37,15 @@ var trailingPort = regexp.MustCompile(`:([0-9]+)$`) var osDefaultInheritEnv = func() []string { switch runtime.GOOS { - case "darwin": + case "darwin", "ios": return []string{"DYLD_LIBRARY_PATH"} - case "linux", "freebsd", "openbsd": + case "linux", "freebsd", "netbsd", "openbsd": return []string{"LD_LIBRARY_PATH"} case "hpux": return []string{"LD_LIBRARY_PATH", "SHLIB_PATH"} case "irix": return []string{"LD_LIBRARY_PATH", "LD_LIBRARYN32_PATH", "LD_LIBRARY64_PATH"} - case "solaris": + case "illumos", "solaris": return []string{"LD_LIBRARY_PATH", "LD_LIBRARY_PATH_32", "LD_LIBRARY_PATH_64"} case "windows": return []string{"SystemRoot", "COMSPEC", "PATHEXT", "WINDIR"} |