diff options
| author | WiSo <wiso@xbmc.org> | 2011-02-22 19:52:08 +0100 |
|---|---|---|
| committer | WiSo <wiso@xbmc.org> | 2011-02-22 19:52:08 +0100 |
| commit | beb09d5d5d16e578558c0918955d66c8f88ca571 (patch) | |
| tree | 709abd9107f03a337fac3678fd8060dbc52ddfa2 | |
| parent | cf05a5d669579f61498e8ce1b4f53e44a2e27f74 (diff) | |
[WIN32] fixed: we still use the wrapper for getenv, _environ and __p__environ and therefore need dll_putenv to set those values. The system env is only mirrored once to our wrapper env in init_emu_environ(). (this can hopefully go with external python).
| -rw-r--r-- | xbmc/cores/DllLoader/exports/emu_msvcrt.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/xbmc/cores/DllLoader/exports/emu_msvcrt.cpp b/xbmc/cores/DllLoader/exports/emu_msvcrt.cpp index 70d1fc7957..f89b65003c 100644 --- a/xbmc/cores/DllLoader/exports/emu_msvcrt.cpp +++ b/xbmc/cores/DllLoader/exports/emu_msvcrt.cpp @@ -175,6 +175,8 @@ extern "C" void __stdcall update_emu_environ() #ifdef _WIN32 SetEnvironmentVariable("HTTP_PROXY", "http://" + strProxyServer + ":" + strProxyPort); SetEnvironmentVariable("HTTPS_PROXY", "http://" + strProxyServer + ":" + strProxyPort); + dll_putenv( "HTTP_PROXY=http://" + strProxyServer + ":" + strProxyPort ); + dll_putenv( "HTTPS_PROXY=http://" + strProxyServer + ":" + strProxyPort ); #else setenv( "HTTP_PROXY", "http://" + strProxyServer + ":" + strProxyPort, true ); setenv( "HTTPS_PROXY", "http://" + strProxyServer + ":" + strProxyPort, true ); @@ -184,6 +186,8 @@ extern "C" void __stdcall update_emu_environ() #ifdef _WIN32 SetEnvironmentVariable("PROXY_USER", g_guiSettings.GetString("network.httpproxyusername")); SetEnvironmentVariable("PROXY_PASS", g_guiSettings.GetString("network.httpproxypassword")); + dll_putenv("PROXY_USER=" + g_guiSettings.GetString("network.httpproxyusername")); + dll_putenv("PROXY_PASS=" + g_guiSettings.GetString("network.httpproxypassword")); #else setenv("PROXY_USER", g_guiSettings.GetString("network.httpproxyusername"), true); setenv("PROXY_PASS", g_guiSettings.GetString("network.httpproxypassword"), true); |