r18581 - in /packages/unstable/libproxy/debian: changelog control control.in patches/50_px-wpad-fallback-env-var.patch
pochu-guest at users.alioth.debian.org
pochu-guest at users.alioth.debian.org
Mon Mar 2 23:44:47 UTC 2009
Author: pochu-guest
Date: Mon Mar 2 23:44:47 2009
New Revision: 18581
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=18581
Log:
Fix if/else logic in and a wrong free in 50_px-wpad-fallback-env-var.
Modified:
packages/unstable/libproxy/debian/changelog
packages/unstable/libproxy/debian/control
packages/unstable/libproxy/debian/control.in
packages/unstable/libproxy/debian/patches/50_px-wpad-fallback-env-var.patch
Modified: packages/unstable/libproxy/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/libproxy/debian/changelog?rev=18581&op=diff
==============================================================================
--- packages/unstable/libproxy/debian/changelog (original)
+++ packages/unstable/libproxy/debian/changelog Mon Mar 2 23:44:47 2009
@@ -18,4 +18,7 @@
decide whether to fall back to wpad:// style autodetection or not,
defaulting to not fallback when the env var isn't set.
+ [ Emilio Pozuelo Monfort ]
+ * Fix if/else logic in and a wrong free in 50_px-wpad-fallback-env-var.
+
-- Emilio Pozuelo Monfort <pochu at ubuntu.com> Wed, 17 Dec 2008 23:25:40 +0100
Modified: packages/unstable/libproxy/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/libproxy/debian/control?rev=18581&op=diff
==============================================================================
--- packages/unstable/libproxy/debian/control (original)
+++ packages/unstable/libproxy/debian/control Mon Mar 2 23:44:47 2009
@@ -23,7 +23,6 @@
Package: libproxy0
Architecture: any
-Section: libs
Depends: ${shlibs:Depends},
${misc:Depends}
Description: automatic proxy configuration management library (shared)
@@ -46,7 +45,6 @@
Package: libproxy-tools
Architecture: any
-Section: libs
Depends: ${shlibs:Depends},
${misc:Depends}
Description: automatic proxy configuration management library (tools)
Modified: packages/unstable/libproxy/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/libproxy/debian/control.in?rev=18581&op=diff
==============================================================================
--- packages/unstable/libproxy/debian/control.in (original)
+++ packages/unstable/libproxy/debian/control.in Mon Mar 2 23:44:47 2009
@@ -12,7 +12,6 @@
network-manager-dev,
libdbus-1-dev,
libwebkit-dev,
- xulrunner-dev,
libgconf2-dev,
libxmu-dev
Standards-Version: 3.8.0
@@ -23,7 +22,6 @@
Package: libproxy0
Architecture: any
-Section: libs
Depends: ${shlibs:Depends},
${misc:Depends}
Description: automatic proxy configuration management library (shared)
@@ -46,7 +44,6 @@
Package: libproxy-tools
Architecture: any
-Section: libs
Depends: ${shlibs:Depends},
${misc:Depends}
Description: automatic proxy configuration management library (tools)
Modified: packages/unstable/libproxy/debian/patches/50_px-wpad-fallback-env-var.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/libproxy/debian/patches/50_px-wpad-fallback-env-var.patch?rev=18581&op=diff
==============================================================================
--- packages/unstable/libproxy/debian/patches/50_px-wpad-fallback-env-var.patch (original)
+++ packages/unstable/libproxy/debian/patches/50_px-wpad-fallback-env-var.patch Mon Mar 2 23:44:47 2009
@@ -1,7 +1,7 @@
-diff -Nur -x '*.orig' -x '*~' libproxy-0.2.3/src/lib/proxy_factory.c libproxy-0.2.3.new/src/lib/proxy_factory.c
+diff -ruNp libproxy-0.2.3/src/lib/proxy_factory.c libproxy-0.2.3.new/src/lib/proxy_factory.c
--- libproxy-0.2.3/src/lib/proxy_factory.c 2008-06-05 22:56:15.000000000 +0200
-+++ libproxy-0.2.3.new/src/lib/proxy_factory.c 2009-01-08 11:33:28.000000000 +0100
-@@ -514,6 +514,8 @@
++++ libproxy-0.2.3.new/src/lib/proxy_factory.c 2009-03-03 00:37:14.000000000 +0100
+@@ -514,6 +514,8 @@ px_proxy_factory_get_proxies (pxProxyFac
pxConfig *config = NULL;
char **response = px_strsplit("direct://", ";");
char *tmp = NULL, *order = NULL, **orderv = NULL;
@@ -10,7 +10,7 @@
// Verify some basic stuff
if (!self) goto do_return;
-@@ -581,9 +583,27 @@
+@@ -581,9 +583,24 @@ px_proxy_factory_get_proxies (pxProxyFac
for (int i=0 ; self->configs && self->configs[i] && !config ; i++)
config = self->configs[i]->callback(self);
@@ -19,13 +19,10 @@
+ wpad_fallback_env = getenv("PX_WPAD_FALLBACK");
+ if (wpad_fallback_env)
+ {
-+ if (!strcmp(wpad_fallback_env, "0")) {
-+ do_wpad_fallback = 0;
-+ } else if (!strcmp(wpad_fallback_env, "0")) {
++ if (strcmp(wpad_fallback_env, "0")) {
+ do_wpad_fallback = 1;
+ }
+ }
-+ px_free(wpad_fallback_env);
+
// No plugin returned a valid config, fall back to 'wpad://'
if (!config)
@@ -38,15 +35,17 @@
fprintf(stderr, "*** Unable to locate valid config! Falling back to auto-detection...\n");
config = px_malloc0(sizeof(pxConfig));
config->url = px_strdup("wpad://");
-@@ -597,6 +617,11 @@
+@@ -591,7 +608,12 @@ px_proxy_factory_get_proxies (pxProxyFac
+ }
+
+ // If the config plugin returned an invalid config type or malformed URL, fall back to 'wpad://'
+- if (!(!strncmp(config->url, "http://", 7) ||
++ if (!do_wpad_fallback)
++ {
++ fprintf(stderr, "*** Config plugin returned invalid URL type and WPAD fallback disabled! Falling back to direct...\n");
++ goto do_return;
++ }
++ else if (!(!strncmp(config->url, "http://", 7) ||
+ !strncmp(config->url, "socks://", 8) ||
+ !strncmp(config->url, "pac+", 4) ||
!strcmp (config->url, "wpad://") ||
- !strcmp (config->url, "direct://")))
- {
-+ if (!do_wpad_fallback)
-+ {
-+ fprintf(stderr, "*** Config plugin returned invalid URL type and WPAD fallback disabled! Falling back to direct...\n");
-+ goto do_return;
-+ }
- fprintf(stderr, "*** Config plugin returned invalid URL type! Falling back to auto-detection...\n");
- px_free(config->url);
- config->url = px_strdup("wpad://");
More information about the pkg-gnome-commits
mailing list