mozilla: comparison mozilla-libproxy.patch

equal deleted inserted replaced

-:565d666e22a1
+:a535723d4453
 include $(topsrcdir)/config/rules.mk
 diff --git a/toolkit/system/unixproxy/nsLibProxySettings.cpp b/toolkit/system/unixproxy/nsLibProxySettings.cpp
 new file mode 100644
 --- /dev/null
 +++ b/toolkit/system/unixproxy/nsLibProxySettings.cpp
-@@ -0,0 +1,170 @@
+@@ -0,0 +1,178 @@
 +/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 +/* ***** BEGIN LICENSE BLOCK *****
 + * Version: MPL 1.1/GPL 2.0/LGPL 2.1
 + *
 + * The contents of this file are subject to the Mozilla Public License Version
 +class nsUnixSystemProxySettings : public nsISystemProxySettings {
 +public:
 +  NS_DECL_ISUPPORTS
 +  NS_DECL_NSISYSTEMPROXYSETTINGS
 +
-+  nsUnixSystemProxySettings() {}
++  nsUnixSystemProxySettings() { mProxyFactory = nsnull; }
 +  nsresult Init();
 +
 +private:
 +  ~nsUnixSystemProxySettings() {
 +    if (mProxyFactory)
 +NS_IMPL_ISUPPORTS1(nsUnixSystemProxySettings, nsISystemProxySettings)
 +
 +nsresult
 +nsUnixSystemProxySettings::Init()
 +{
-+  mProxyFactory = nsnull;
 +  return NS_OK;
 +}
 +
 +nsresult
 +nsUnixSystemProxySettings::GetPACURI(nsACString& aResult)
 +  char **proxyArray = nsnull;
 +  proxyArray = px_proxy_factory_get_proxies(mProxyFactory, (char*)(spec.get()));
 +  NS_ENSURE_TRUE(proxyArray, NS_ERROR_NOT_AVAILABLE);
 +
 +  // Translate libproxy's output to PAC string as expected
-+  // libproxy's prefixes: http, proxy, socks, socks4, socks5, direct, unknown
++  // libproxy returns an array of proxies in the format:
-+  // PAC format: "PROXY proxy1.foo.com:8080; PROXY proxy2.foo.com:8080; // DIRECT"
++  // <procotol>://[username:password@]proxy:port
++  // or
++  // direct://
++  //
++  // PAC format: "PROXY proxy1.foo.com:8080; PROXY proxy2.foo.com:8080; DIRECT"
 +  int c = 0;
 +  while (proxyArray[c] != NULL) {
-+    if (c != 0) {
++    if (!aResult.IsEmpty()) {
 +      aResult.AppendLiteral("; ");
 +    }
 +
 +    PRBool isScheme = PR_FALSE;
 +    nsXPIDLCString schemeString;
 +    nsXPIDLCString hostPortString;
 +    nsCOMPtr<nsIURI> proxyURI;
 +
 +    rv = ios->NewURI(nsDependentCString(proxyArray[c]),
 +                                        nsnull,
 +                                        nsnull,
 +                                        getter_AddRefs(proxyURI));
-+    NS_ENSURE_SUCCESS(rv, rv);
++    if (NS_FAILED(rv)) {
++      c++;
++      continue;
++    }
 +
 +    proxyURI->GetScheme(schemeString);
 +    if (NS_SUCCEEDED(proxyURI->SchemeIs("http", &isScheme)) && isScheme) {
 +      schemeString.AssignLiteral("proxy");
 +    }
 +    }
 +
 +    c++;
 +  }
 +
-+//printf("returned PAC proxy string: %s\n", PromiseFlatCString(aResult).get());
++#ifdef DEBUG
++  printf("returned PAC proxy string: %s\n", PromiseFlatCString(aResult).get());
++#endif
 +
 +  PR_Free(proxyArray);
 +  return NS_OK;
 +}
 +

changeset 120	a535723d4453
parent 115	5e8354f0b873