r19545 - in /packages/unstable/libproxy/debian: changelog patches/50_px-wpad-fallback-env-var.patch

[pochu-guest at users.alioth.debian.org]

Author: pochu-guest
Date: Sat Apr 11 12:35:32 2009
New Revision: 19545

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=19545
Log:
* debian/patches/50_px-wpad-fallback-env-var.patch:
  - Fix logic to not bypass the config plugin when the env variable
    isn't set. We don't do wpad fallback if the env variable isn't set,
    but there's not reason to ignore the config file if one is provided.
    See https://launchpad.net/bugs/354475.

Modified:
    packages/unstable/libproxy/debian/changelog
    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=19545&op=diff
==============================================================================
--- packages/unstable/libproxy/debian/changelog (original)
+++ packages/unstable/libproxy/debian/changelog Sat Apr 11 12:35:32 2009
@@ -1,3 +1,13 @@
+libproxy (0.2.3-2) UNRELEASED; urgency=low
+
+  * debian/patches/50_px-wpad-fallback-env-var.patch:
+    - Fix logic to not bypass the config plugin when the env variable
+      isn't set. We don't do wpad fallback if the env variable isn't set,
+      but there's not reason to ignore the config file if one is provided.
+      See https://launchpad.net/bugs/354475.
+
+ -- Emilio Pozuelo Monfort <pochu at ubuntu.com>  Sat, 11 Apr 2009 14:31:53 +0200
+
 libproxy (0.2.3-1) unstable; urgency=low
 
   [ Emilio Pozuelo Monfort ]

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=19545&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 Sat Apr 11 12:35:32 2009
@@ -1,6 +1,5 @@
-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-03-03 00:37:14.000000000 +0100
+--- src/lib/proxy_factory.c.orig	2009-04-11 14:23:45.000000000 +0200
++++ src/lib/proxy_factory.c	2009-04-11 14:28:23.000000000 +0200
 @@ -514,6 +514,8 @@ px_proxy_factory_get_proxies (pxProxyFac
  	pxConfig *config   = NULL;
  	char    **response = px_strsplit("direct://", ";");
@@ -35,17 +34,30 @@
  		fprintf(stderr, "*** Unable to locate valid config! Falling back to auto-detection...\n");
  		config         = px_malloc0(sizeof(pxConfig));
  		config->url    = px_strdup("wpad://");
-@@ -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) || 
+@@ -595,20 +612,23 @@ px_proxy_factory_get_proxies (pxProxyFac
  		  !strncmp(config->url, "socks://", 8) ||
  		  !strncmp(config->url, "pac+", 4) ||
  		  !strcmp (config->url, "wpad://") ||
+-		  !strcmp (config->url, "direct://")))
++		  !strcmp (config->url, "direct://"))
++		  && do_wpad_fallback)
+ 	{
+ 		fprintf(stderr, "*** Config plugin returned invalid URL type! Falling back to auto-detection...\n");
+ 		px_free(config->url);
+ 		config->url = px_strdup("wpad://");
+ 	}
+-	else if (!strncmp(config->url, "pac+", 4) && !px_url_is_valid(config->url + 4))
++	else if (!strncmp(config->url, "pac+", 4) && !px_url_is_valid(config->url + 4)
++		 && do_wpad_fallback)
+ 	{
+ 		fprintf(stderr, "*** Config plugin returned malformed URL! Falling back to auto-detection...\n");
+ 		px_free(config->url);
+ 		config->url = px_strdup("wpad://");
+ 	}
+ 	else if ((!strncmp(config->url, "http://", 7) || !strncmp(config->url, "socks://", 8)) && 
+-			  !px_url_is_valid(config->url))
++			  !px_url_is_valid(config->url) &&
++			  do_wpad_fallback)
+ 	{
+ 		fprintf(stderr, "*** Config plugin returned malformed URL! Falling back to auto-detection...\n");
+ 		px_free(config->url);