equal
deleted
inserted
replaced
4 https://bugzilla.mozilla.org/show_bug.cgi?id=517655 |
4 https://bugzilla.mozilla.org/show_bug.cgi?id=517655 |
5 |
5 |
6 diff --git a/config/autoconf.mk.in b/config/autoconf.mk.in |
6 diff --git a/config/autoconf.mk.in b/config/autoconf.mk.in |
7 --- a/config/autoconf.mk.in |
7 --- a/config/autoconf.mk.in |
8 +++ b/config/autoconf.mk.in |
8 +++ b/config/autoconf.mk.in |
9 @@ -539,16 +539,20 @@ FT2_CFLAGS = @FT2_CFLAGS@ |
9 @@ -542,16 +542,20 @@ FT2_CFLAGS = @FT2_CFLAGS@ |
10 FT2_LIBS = @FT2_LIBS@ |
10 FT2_LIBS = @FT2_LIBS@ |
11 |
11 |
12 MOZ_PANGO_CFLAGS = @MOZ_PANGO_CFLAGS@ |
12 MOZ_PANGO_CFLAGS = @MOZ_PANGO_CFLAGS@ |
13 MOZ_PANGO_LIBS = @MOZ_PANGO_LIBS@ |
13 MOZ_PANGO_LIBS = @MOZ_PANGO_LIBS@ |
14 |
14 |
28 GLIB_GMODULE_LIBS = @GLIB_GMODULE_LIBS@ |
28 GLIB_GMODULE_LIBS = @GLIB_GMODULE_LIBS@ |
29 LIBIDL_CFLAGS = @LIBIDL_CFLAGS@ |
29 LIBIDL_CFLAGS = @LIBIDL_CFLAGS@ |
30 diff --git a/config/system-headers b/config/system-headers |
30 diff --git a/config/system-headers b/config/system-headers |
31 --- a/config/system-headers |
31 --- a/config/system-headers |
32 +++ b/config/system-headers |
32 +++ b/config/system-headers |
33 @@ -1013,8 +1013,11 @@ hunspell.hxx |
33 @@ -1013,11 +1013,14 @@ hunspell.hxx |
34 #if MOZ_NATIVE_BZ2==1 |
34 #if MOZ_NATIVE_BZ2==1 |
35 bzlib.h |
35 bzlib.h |
36 #endif |
36 #endif |
37 #if MOZ_PLATFORM_MAEMO==5 |
37 #if MOZ_PLATFORM_MAEMO==5 |
38 hildon-uri.h |
38 hildon-uri.h |
40 libosso.h |
40 libosso.h |
41 #endif |
41 #endif |
42 +#ifdef MOZ_ENABLE_LIBPROXY |
42 +#ifdef MOZ_ENABLE_LIBPROXY |
43 +proxy.h |
43 +proxy.h |
44 +#endif |
44 +#endif |
|
45 #if MOZ_NATIVE_LIBEVENT==1 |
|
46 event.h |
|
47 #endif |
45 diff --git a/configure.in b/configure.in |
48 diff --git a/configure.in b/configure.in |
46 --- a/configure.in |
49 --- a/configure.in |
47 +++ b/configure.in |
50 +++ b/configure.in |
48 @@ -5289,16 +5289,39 @@ then |
51 @@ -5325,16 +5325,39 @@ then |
49 AC_DEFINE(MOZ_ENABLE_DBUS) |
52 AC_DEFINE(MOZ_ENABLE_DBUS) |
50 fi |
53 fi |
51 fi |
54 fi |
52 AC_SUBST(MOZ_ENABLE_DBUS) |
55 AC_SUBST(MOZ_ENABLE_DBUS) |
53 AC_SUBST(MOZ_DBUS_GLIB_CFLAGS) |
56 AC_SUBST(MOZ_DBUS_GLIB_CFLAGS) |
224 + nsUnixSystemProxySettings() {} |
227 + nsUnixSystemProxySettings() {} |
225 + nsresult Init(); |
228 + nsresult Init(); |
226 + |
229 + |
227 +private: |
230 +private: |
228 + ~nsUnixSystemProxySettings() { |
231 + ~nsUnixSystemProxySettings() { |
229 + if (mProxyFactory) |
232 + if (mProxyFactory) |
230 + px_proxy_factory_free(mProxyFactory); |
233 + px_proxy_factory_free(mProxyFactory); |
231 + } |
234 + } |
232 + |
235 + |
233 + pxProxyFactory *mProxyFactory; |
236 + pxProxyFactory *mProxyFactory; |
234 + nsCOMPtr<nsIIOService> mIOService; |
237 + nsCOMPtr<nsIIOService> mIOService; |
235 +}; |
238 +}; |
286 + PRBool isScheme = PR_FALSE; |
289 + PRBool isScheme = PR_FALSE; |
287 + nsXPIDLCString schemeString; |
290 + nsXPIDLCString schemeString; |
288 + nsXPIDLCString hostPortString; |
291 + nsXPIDLCString hostPortString; |
289 + nsCOMPtr<nsIURI> proxyURI; |
292 + nsCOMPtr<nsIURI> proxyURI; |
290 + |
293 + |
291 + rv = mIOService->NewURI(nsDependentCString(proxyArray[c]), |
294 + rv = mIOService->NewURI(nsDependentCString(proxyArray[c]), |
292 + nsnull, |
295 + nsnull, |
293 + nsnull, |
296 + nsnull, |
294 + getter_AddRefs(proxyURI)); |
297 + getter_AddRefs(proxyURI)); |
295 + NS_ENSURE_SUCCESS(rv, rv); |
298 + NS_ENSURE_SUCCESS(rv, rv); |
296 + |
299 + |
297 + proxyURI->GetScheme(schemeString); |
300 + proxyURI->GetScheme(schemeString); |
298 + if (NS_SUCCEEDED(proxyURI->SchemeIs("http", &isScheme)) && isScheme) { |
301 + if (NS_SUCCEEDED(proxyURI->SchemeIs("http", &isScheme)) && isScheme) { |