forked from mirrors/gecko-dev
5dc21d568c
The inclusions were removed with the following very crude script and the
resulting breakage was fixed up by hand. The manual fixups did either
revert the changes done by the script, replace a generic header with a more
specific one or replace a header with a forward declaration.
find . -name "*.idl" | grep -v web-platform | grep -v third_party | while read path; do
interfaces=$(grep "^\(class\|interface\).*:.*" "$path" | cut -d' ' -f2)
if [ -n "$interfaces" ]; then
if [[ "$interfaces" == *$'\n'* ]]; then
regexp="\("
for i in $interfaces; do regexp="$regexp$i\|"; done
regexp="${regexp%%\\\|}\)"
else
regexp="$interfaces"
fi
interface=$(basename "$path")
rg -l "#include.*${interface%%.idl}.h" . | while read path2; do
hits=$(grep -v "#include.*${interface%%.idl}.h" "$path2" | grep -c "$regexp" )
if [ $hits -eq 0 ]; then
echo "Removing ${interface} from ${path2}"
grep -v "#include.*${interface%%.idl}.h" "$path2" > "$path2".tmp
mv -f "$path2".tmp "$path2"
fi
done
fi
done
Differential Revision: https://phabricator.services.mozilla.com/D55444
--HG--
extra : moz-landing-system : lando
104 lines
3 KiB
C++
104 lines
3 KiB
C++
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
|
|
/* This Source Code Form is subject to the terms of the Mozilla Public
|
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
|
|
|
#include "nsISystemProxySettings.h"
|
|
#include "mozilla/Components.h"
|
|
#include "nsString.h"
|
|
#include "nsCOMPtr.h"
|
|
#include "nsNetCID.h"
|
|
#include "nspr.h"
|
|
|
|
extern "C" {
|
|
#include <proxy.h>
|
|
}
|
|
|
|
class nsUnixSystemProxySettings : public nsISystemProxySettings {
|
|
public:
|
|
NS_DECL_THREADSAFE_ISUPPORTS
|
|
NS_DECL_NSISYSTEMPROXYSETTINGS
|
|
|
|
nsUnixSystemProxySettings() { mProxyFactory = nullptr; }
|
|
|
|
private:
|
|
~nsUnixSystemProxySettings() {
|
|
if (mProxyFactory) px_proxy_factory_free(mProxyFactory);
|
|
}
|
|
|
|
pxProxyFactory* mProxyFactory;
|
|
};
|
|
|
|
NS_IMPL_ISUPPORTS(nsUnixSystemProxySettings, nsISystemProxySettings)
|
|
|
|
NS_IMETHODIMP
|
|
nsUnixSystemProxySettings::GetMainThreadOnly(bool* aMainThreadOnly) {
|
|
*aMainThreadOnly = false;
|
|
return NS_OK;
|
|
}
|
|
|
|
nsresult nsUnixSystemProxySettings::GetPACURI(nsACString& aResult) {
|
|
// Make sure we return an empty result.
|
|
aResult.Truncate();
|
|
return NS_OK;
|
|
}
|
|
|
|
nsresult nsUnixSystemProxySettings::GetProxyForURI(const nsACString& aSpec,
|
|
const nsACString& aScheme,
|
|
const nsACString& aHost,
|
|
const int32_t aPort,
|
|
nsACString& aResult) {
|
|
nsresult rv;
|
|
|
|
if (!mProxyFactory) {
|
|
mProxyFactory = px_proxy_factory_new();
|
|
}
|
|
NS_ENSURE_TRUE(mProxyFactory, NS_ERROR_NOT_AVAILABLE);
|
|
|
|
char** proxyArray = nullptr;
|
|
proxyArray = px_proxy_factory_get_proxies(mProxyFactory,
|
|
PromiseFlatCString(aSpec).get());
|
|
NS_ENSURE_TRUE(proxyArray, NS_ERROR_NOT_AVAILABLE);
|
|
|
|
// Translate libproxy's output to PAC string as expected
|
|
// libproxy returns an array of proxies in the format:
|
|
// <procotol>://[username:password@]proxy:port
|
|
// or
|
|
// direct://
|
|
//
|
|
// PAC format: "PROXY proxy1.foo.com:8080; PROXY proxy2.foo.com:8080; DIRECT"
|
|
// but nsISystemProxySettings allows "PROXY http://proxy.foo.com:8080" as
|
|
// well.
|
|
|
|
int c = 0;
|
|
while (proxyArray[c] != nullptr) {
|
|
if (!aResult.IsEmpty()) {
|
|
aResult.AppendLiteral("; ");
|
|
}
|
|
|
|
// figure out the scheme, and we can't use nsIIOService::NewURI because
|
|
// this is not the main thread.
|
|
char* colon = strchr(proxyArray[c], ':');
|
|
uint32_t schemelen = colon ? colon - proxyArray[c] : 0;
|
|
if (schemelen < 1) {
|
|
c++;
|
|
continue;
|
|
}
|
|
|
|
if (schemelen == 6 && !strncasecmp(proxyArray[c], "direct", 6)) {
|
|
aResult.AppendLiteral("DIRECT");
|
|
} else {
|
|
aResult.AppendLiteral("PROXY ");
|
|
aResult.Append(proxyArray[c]);
|
|
}
|
|
|
|
c++;
|
|
}
|
|
|
|
free(proxyArray);
|
|
return NS_OK;
|
|
}
|
|
|
|
NS_IMPL_COMPONENT_FACTORY(nsUnixSystemProxySettings) {
|
|
return do_AddRef(new nsUnixSystemProxySettings()).downcast<nsISupports>();
|
|
}
|