Mercurial > pidgin.yaz

changeset 10534:975c2e66cd53

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[gaim-migrate @ 11866] If you have your proxy set to 'Use Environmental Settings', but don't actually have any relevant environment variables set, you probably want to connect directly (as mentioned in bug 1105809). This does just that. committer: Tailor Script <tailor@pidgin.im>
author Stu Tomlinson <stu@nosnilmot.com>
date Thu, 20 Jan 2005 20:58:25 +0000
parents ace8cd0de6ea
children f175ff63d571
files src/proxy.c
diffstat 1 files changed, 5 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/proxy.c	Thu Jan 20 16:37:14 2005 +0000
+++ b/src/proxy.c	Thu Jan 20 20:58:25 2005 +0000
@@ -1563,7 +1563,7 @@
 	if (gaim_proxy_info_get_type(phb->gpi) == GAIM_PROXY_USE_ENVVAR) {
 		if ((tmp = g_getenv("HTTP_PROXY")) != NULL ||
 			(tmp = g_getenv("http_proxy")) != NULL ||
-			(tmp= g_getenv("HTTPPROXY")) != NULL) {
+			(tmp = g_getenv("HTTPPROXY")) != NULL) {
 			char *proxyhost,*proxypath,*proxyuser,*proxypasswd;
 			int proxyport;
 
@@ -1592,6 +1592,10 @@
 
 				gaim_proxy_info_set_port(phb->gpi, proxyport);
 			}
+		} else {
+			/* no proxy environment variable found, don't use a proxy */
+			gaim_debug_info("proxy", "No environment settings found, not using a proxy\n");
+			gaim_proxy_info_set_type(phb->gpi, GAIM_PROXY_NONE);
 		}
 
 		/* XXX: Do we want to skip this step if user/password were part of url? */