gaim/gaim

If you have your proxy set to 'Use Environmental Settings', but don't actually
oldstatus
2005-01-20, Stu Tomlinson
447c0ee8961c
Parents 682206c2a3e2
Children a9f7ea12bdf4
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.
1 files changed, 5 insertions(+), 1 deletions(-)
  • +5 -1
    src/proxy.c
    • --- a/src/proxy.c Thu Jan 20 14:51:24 2005 -0500
    +++ b/src/proxy.c Thu Jan 20 15:57:50 2005 -0500
    @@ -1562,7 +1562,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;
    @@ -1591,6 +1591,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? */