mozilla-libproxy-compat.patch
author Wolfgang Rosenauer <wr@rosenauer.org>
Wed, 03 Sep 2014 20:01:19 +0200
branchfirefox32
changeset 759 b2ae89c6dea9
parent 600 5eb2128332e5
permissions -rw-r--r--
Firefox 32.0 goes production
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
600
5eb2128332e5 18.0 release
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
     1
# HG changeset patch
5eb2128332e5 18.0 release
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
     2
# Parent 99164862ccce7947259465dcf9edbf6375d56413
5eb2128332e5 18.0 release
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
     3
# User Wolfgang Rosenauer <wr@rosenauer.org>
5eb2128332e5 18.0 release
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
     4
No bug - libproxy API change picked up in bmo#769764 but fails in openSUSE 11.2 and earlier. Still cast to char* to make "all" happy
5eb2128332e5 18.0 release
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
     5
Note: Remove that patch when openSUSE 11.2 runs out of any support!
5eb2128332e5 18.0 release
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
     6
5eb2128332e5 18.0 release
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
     7
diff --git a/toolkit/system/unixproxy/nsLibProxySettings.cpp b/toolkit/system/unixproxy/nsLibProxySettings.cpp
5eb2128332e5 18.0 release
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
     8
--- a/toolkit/system/unixproxy/nsLibProxySettings.cpp
5eb2128332e5 18.0 release
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
     9
+++ b/toolkit/system/unixproxy/nsLibProxySettings.cpp
5eb2128332e5 18.0 release
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    10
@@ -67,17 +67,17 @@ nsUnixSystemProxySettings::GetProxyForUR
5eb2128332e5 18.0 release
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    11
 
5eb2128332e5 18.0 release
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    12
   if (!mProxyFactory) {
5eb2128332e5 18.0 release
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    13
     mProxyFactory = px_proxy_factory_new();
5eb2128332e5 18.0 release
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    14
   }
5eb2128332e5 18.0 release
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    15
   NS_ENSURE_TRUE(mProxyFactory, NS_ERROR_NOT_AVAILABLE);
5eb2128332e5 18.0 release
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    16
 
5eb2128332e5 18.0 release
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    17
   char **proxyArray = nullptr;
5eb2128332e5 18.0 release
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    18
   proxyArray = px_proxy_factory_get_proxies(mProxyFactory,
5eb2128332e5 18.0 release
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    19
-                                            PromiseFlatCString(aSpec).get());
5eb2128332e5 18.0 release
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    20
+                                            (char *) (PromiseFlatCString(aSpec).get()));
5eb2128332e5 18.0 release
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    21
   NS_ENSURE_TRUE(proxyArray, NS_ERROR_NOT_AVAILABLE);
5eb2128332e5 18.0 release
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    22
 
5eb2128332e5 18.0 release
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    23
   // Translate libproxy's output to PAC string as expected
5eb2128332e5 18.0 release
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    24
   // libproxy returns an array of proxies in the format:
5eb2128332e5 18.0 release
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    25
   // <procotol>://[username:password@]proxy:port
5eb2128332e5 18.0 release
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    26
   // or
5eb2128332e5 18.0 release
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    27
   // direct://
5eb2128332e5 18.0 release
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    28
   //