From b9baae32b7f3d0ff6d53c289b6691ebb6a767d44 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 1 Feb 2012 19:12:29 +0100 Subject: Xulrunner 10 --- mozilla-682832-proxy.patch | 68 +++++++++++++++++++++++----------------------- 1 file changed, 34 insertions(+), 34 deletions(-) (limited to 'mozilla-682832-proxy.patch') diff --git a/mozilla-682832-proxy.patch b/mozilla-682832-proxy.patch index 076b2a6..0f643f9 100644 --- a/mozilla-682832-proxy.patch +++ b/mozilla-682832-proxy.patch @@ -1,7 +1,7 @@ -diff -up mozilla-release/toolkit/system/gnome/nsGSettingsService.cpp.682832 mozilla-release/toolkit/system/gnome/nsGSettingsService.cpp ---- mozilla-release/toolkit/system/gnome/nsGSettingsService.cpp.682832 2011-11-04 22:34:19.000000000 +0100 -+++ mozilla-release/toolkit/system/gnome/nsGSettingsService.cpp 2011-12-07 11:36:29.302312405 +0100 -@@ -42,6 +42,8 @@ +diff -up xulrunner-10.0/mozilla-beta/toolkit/system/gnome/nsGSettingsService.cpp.682832 xulrunner-10.0/mozilla-beta/toolkit/system/gnome/nsGSettingsService.cpp +--- xulrunner-10.0/mozilla-beta/toolkit/system/gnome/nsGSettingsService.cpp.682832 2012-01-18 17:25:24.000000000 +0100 ++++ xulrunner-10.0/mozilla-beta/toolkit/system/gnome/nsGSettingsService.cpp 2012-01-23 15:40:14.803170842 +0100 +@@ -44,6 +44,8 @@ #include "nsMemory.h" #include "prlink.h" #include "nsComponentManagerUtils.h" @@ -10,7 +10,7 @@ diff -up mozilla-release/toolkit/system/gnome/nsGSettingsService.cpp.682832 mozi #include #include -@@ -56,6 +58,7 @@ typedef struct _GVariant GVariant; +@@ -60,6 +62,7 @@ typedef struct _GVariant GVariant; # define G_VARIANT_TYPE_STRING ((const GVariantType *) "s") # define G_VARIANT_TYPE_OBJECT_PATH ((const GVariantType *) "o") # define G_VARIANT_TYPE_SIGNATURE ((const GVariantType *) "g") @@ -18,7 +18,7 @@ diff -up mozilla-release/toolkit/system/gnome/nsGSettingsService.cpp.682832 mozi #endif #define GSETTINGS_FUNCTIONS \ -@@ -68,6 +71,7 @@ typedef struct _GVariant GVariant; +@@ -72,6 +75,7 @@ typedef struct _GVariant GVariant; FUNC(g_variant_get_int32, gint32, (GVariant* variant)) \ FUNC(g_variant_get_boolean, gboolean, (GVariant* variant)) \ FUNC(g_variant_get_string, const char *, (GVariant* value, gsize* length)) \ @@ -26,7 +26,7 @@ diff -up mozilla-release/toolkit/system/gnome/nsGSettingsService.cpp.682832 mozi FUNC(g_variant_is_of_type, gboolean, (GVariant* value, const GVariantType* type)) \ FUNC(g_variant_new_int32, GVariant *, (gint32 value)) \ FUNC(g_variant_new_boolean, GVariant *, (gboolean value)) \ -@@ -91,6 +95,7 @@ GSETTINGS_FUNCTIONS +@@ -95,6 +99,7 @@ GSETTINGS_FUNCTIONS #define g_variant_get_int32 _g_variant_get_int32 #define g_variant_get_boolean _g_variant_get_boolean #define g_variant_get_string _g_variant_get_string @@ -34,7 +34,7 @@ diff -up mozilla-release/toolkit/system/gnome/nsGSettingsService.cpp.682832 mozi #define g_variant_is_of_type _g_variant_is_of_type #define g_variant_new_int32 _g_variant_new_int32 #define g_variant_new_boolean _g_variant_new_boolean -@@ -263,6 +268,49 @@ nsGSettingsCollection::GetInt(const nsAC +@@ -267,6 +272,49 @@ nsGSettingsCollection::GetInt(const nsAC return NS_OK; } @@ -81,12 +81,12 @@ diff -up mozilla-release/toolkit/system/gnome/nsGSettingsService.cpp.682832 mozi + return NS_OK; +} + - nsresult - nsGSettingsService::Init() - { -diff -up mozilla-release/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp.682832 mozilla-release/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp ---- mozilla-release/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp.682832 2011-11-04 22:34:19.000000000 +0100 -+++ mozilla-release/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp 2011-12-07 11:40:48.432502399 +0100 + // These types are local to nsGSettingsService::Init, but ISO C++98 doesn't + // allow a template (ArrayLength) to be instantiated based on a local type. + // Boo-urns! +diff -up xulrunner-10.0/mozilla-beta/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp.682832 xulrunner-10.0/mozilla-beta/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp +--- xulrunner-10.0/mozilla-beta/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp.682832 2012-01-18 17:25:24.000000000 +0100 ++++ xulrunner-10.0/mozilla-beta/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp 2012-01-23 15:39:23.083172529 +0100 @@ -49,6 +49,7 @@ #include "nsPrintfCString.h" #include "nsNetUtil.h" @@ -100,7 +100,7 @@ diff -up mozilla-release/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp. nsCOMPtr mGConf; + nsCOMPtr mGSettings; - PRBool IsProxyMode(const char* aMode); + bool IsProxyMode(const char* aMode); nsresult SetProxyResultFromGConf(const char* aKeyBase, const char* aType, nsACString& aResult); nsresult GetProxyFromGConf(const nsACString& aScheme, const nsACString& aHost, PRInt32 aPort, nsACString& aResult); + nsresult GetProxyFromGSettings(const nsACString& aScheme, const nsACString& aHost, PRInt32 aPort, nsACString& aResult); @@ -116,7 +116,7 @@ diff -up mozilla-release/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp. return NS_OK; } -@@ -87,14 +92,30 @@ nsUnixSystemProxySettings::IsProxyMode(c +@@ -87,14 +92,31 @@ nsUnixSystemProxySettings::IsProxyMode(c nsresult nsUnixSystemProxySettings::GetPACURI(nsACString& aResult) { @@ -141,7 +141,7 @@ diff -up mozilla-release/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp. + return NS_OK; + } } -- + - return mGConf->GetString(NS_LITERAL_CSTRING("/system/proxy/autoconfig_url"), - aResult); + if (mGConf && IsProxyMode("auto")) { @@ -153,8 +153,8 @@ diff -up mozilla-release/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp. + return NS_OK; } - static PRBool -@@ -231,7 +252,38 @@ nsUnixSystemProxySettings::SetProxyResul + static bool +@@ -231,7 +253,38 @@ nsUnixSystemProxySettings::SetProxyResul PRInt32 port; rv = mGConf->GetInt(portKey, &port); NS_ENSURE_SUCCESS(rv, rv); @@ -193,13 +193,13 @@ diff -up mozilla-release/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp. SetProxyResult(aType, host, port, aResult); return NS_OK; } -@@ -271,17 +323,17 @@ static PRBool ConvertToIPV6Addr(const ns +@@ -271,17 +324,17 @@ static bool ConvertToIPV6Addr(const nsAC PRIPv6Addr* aAddr) { PRNetAddr addr; + // try to convert hostname to IP if (PR_StringToNetAddr(PromiseFlatCString(aName).get(), &addr) != PR_SUCCESS) - return PR_FALSE; + return false; - PRIPv6Addr ipv6; // convert parsed address to IPv6 @@ -212,20 +212,20 @@ diff -up mozilla-release/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp. - memcpy(&ipv6, &addr.ipv6.ip, sizeof(PRIPv6Addr)); + memcpy(aAddr, &addr.ipv6.ip, sizeof(PRIPv6Addr)); } else { - return PR_FALSE; + return false; } -@@ -289,8 +341,8 @@ static PRBool ConvertToIPV6Addr(const ns - return PR_TRUE; +@@ -289,8 +342,8 @@ static bool ConvertToIPV6Addr(const nsAC + return true; } --static PRBool GConfIgnoreHost(const nsACString& aIgnore, +-static bool GConfIgnoreHost(const nsACString& aIgnore, - const nsACString& aHost) +static bool HostIgnoredByProxy(const nsACString& aIgnore, + const nsACString& aHost) { if (aIgnore.Equals(aHost, nsCaseInsensitiveCStringComparator())) - return PR_TRUE; -@@ -321,8 +373,9 @@ static PRBool GConfIgnoreHost(const nsAC + return true; +@@ -321,8 +374,9 @@ static bool GConfIgnoreHost(const nsACSt slash = end; } @@ -234,9 +234,9 @@ diff -up mozilla-release/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp. - if (!ConvertToIPV6Addr(aIgnore, &ignoreAddr) || + if (!ConvertToIPV6Addr(ignoreStripped, &ignoreAddr) || !ConvertToIPV6Addr(aHost, &hostAddr)) - return PR_FALSE; + return false; -@@ -355,7 +408,7 @@ nsUnixSystemProxySettings::GetProxyFromG +@@ -355,7 +409,7 @@ nsUnixSystemProxySettings::GetProxyFromG if (str) { nsAutoString s; if (NS_SUCCEEDED(str->GetData(s)) && !s.IsEmpty()) { @@ -245,7 +245,7 @@ diff -up mozilla-release/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp. aResult.AppendLiteral("DIRECT"); return NS_OK; } -@@ -392,6 +445,71 @@ nsUnixSystemProxySettings::GetProxyFromG +@@ -392,6 +446,71 @@ nsUnixSystemProxySettings::GetProxyFromG } nsresult @@ -317,7 +317,7 @@ diff -up mozilla-release/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp. nsUnixSystemProxySettings::GetProxyForURI(nsIURI* aURI, nsACString& aResult) { nsCAutoString scheme; -@@ -406,10 +524,15 @@ nsUnixSystemProxySettings::GetProxyForUR +@@ -406,10 +525,15 @@ nsUnixSystemProxySettings::GetProxyForUR rv = aURI->GetPort(&port); NS_ENSURE_SUCCESS(rv, rv); @@ -336,9 +336,9 @@ diff -up mozilla-release/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp. } #define NS_UNIXSYSTEMPROXYSERVICE_CID /* 0fa3158c-d5a7-43de-9181-a285e74cf1d4 */\ -diff -up mozilla-release/xpcom/system/nsIGSettingsService.idl.682832 mozilla-release/xpcom/system/nsIGSettingsService.idl ---- mozilla-release/xpcom/system/nsIGSettingsService.idl.682832 2011-11-04 22:34:23.000000000 +0100 -+++ mozilla-release/xpcom/system/nsIGSettingsService.idl 2011-12-07 11:32:37.976256951 +0100 +diff -up xulrunner-10.0/mozilla-beta/xpcom/system/nsIGSettingsService.idl.682832 xulrunner-10.0/mozilla-beta/xpcom/system/nsIGSettingsService.idl +--- xulrunner-10.0/mozilla-beta/xpcom/system/nsIGSettingsService.idl.682832 2012-01-18 17:25:28.000000000 +0100 ++++ xulrunner-10.0/mozilla-beta/xpcom/system/nsIGSettingsService.idl 2012-01-23 15:32:29.890186340 +0100 @@ -39,7 +39,7 @@ #include "nsISupports.idl" #include "nsIArray.idl" -- cgit