600
|
1 |
# HG changeset patch
|
|
2 |
# Parent 99164862ccce7947259465dcf9edbf6375d56413
|
|
3 |
# User Wolfgang Rosenauer <wr@rosenauer.org>
|
|
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
|
|
5 |
Note: Remove that patch when openSUSE 11.2 runs out of any support!
|
|
6 |
|
|
7 |
diff --git a/toolkit/system/unixproxy/nsLibProxySettings.cpp b/toolkit/system/unixproxy/nsLibProxySettings.cpp
|
|
8 |
--- a/toolkit/system/unixproxy/nsLibProxySettings.cpp
|
|
9 |
+++ b/toolkit/system/unixproxy/nsLibProxySettings.cpp
|
|
10 |
@@ -67,17 +67,17 @@ nsUnixSystemProxySettings::GetProxyForUR
|
|
11 |
|
|
12 |
if (!mProxyFactory) {
|
|
13 |
mProxyFactory = px_proxy_factory_new();
|
|
14 |
}
|
|
15 |
NS_ENSURE_TRUE(mProxyFactory, NS_ERROR_NOT_AVAILABLE);
|
|
16 |
|
|
17 |
char **proxyArray = nullptr;
|
|
18 |
proxyArray = px_proxy_factory_get_proxies(mProxyFactory,
|
|
19 |
- PromiseFlatCString(aSpec).get());
|
|
20 |
+ (char *) (PromiseFlatCString(aSpec).get()));
|
|
21 |
NS_ENSURE_TRUE(proxyArray, NS_ERROR_NOT_AVAILABLE);
|
|
22 |
|
|
23 |
// Translate libproxy's output to PAC string as expected
|
|
24 |
// libproxy returns an array of proxies in the format:
|
|
25 |
// <procotol>://[username:password@]proxy:port
|
|
26 |
// or
|
|
27 |
// direct://
|
|
28 |
//
|