commit 40a17bafb1d1c647b2548c53cf948f900a43fae0 Author: Christoph Moench-Tegeder Bug 2040125 - add GetSystemProxyDirect() to libproxy path r=kershaw,valentin,#necko-reviewers In bmo #2028356 a "fast-path to skip proxy resolution[...]" was added, but the required method GetSystemProxyDirect() was not added for libproxy-enabled builds (all other cases - general Unix without libproxy, OSX, Windows - got that function). This makes a "--enable-libproxy" build (MOZ_ENABLE_LIBPROXY) fail at startup, as the symbol for nsUnixSystemProxySettings::GetSystemProxyDirect() does not resolve. This adds GetSystemProxyDirect() to the MOZ_ENABLE_LIBPROXY case - it's trivial, as we cannot know what libproxy will return for a specific URL, thus the fast-path does not apply and we can just return "false". Differential Revision: https://phabricator.services.mozilla.com/D300937 diff --git toolkit/system/unixproxy/nsLibProxySettings.cpp toolkit/system/unixproxy/nsLibProxySettings.cpp index 3de1b7ce9b8f..8b063d446c1e 100644 --- toolkit/system/unixproxy/nsLibProxySettings.cpp +++ toolkit/system/unixproxy/nsLibProxySettings.cpp @@ -111,6 +111,13 @@ nsUnixSystemProxySettings::GetSystemWPADSetting(bool* aSystemWPADSetting) { return NS_OK; } +// we do not know if libproxy would return DIRECT or PROXY +NS_IMETHODIMP +nsUnixSystemProxySettings::GetSystemProxyDirect(bool* aResult) { + *aResult = false; + return NS_OK; +} + NS_IMPL_COMPONENT_FACTORY(nsUnixSystemProxySettings) { return do_AddRef(new nsUnixSystemProxySettings()).downcast(); }