[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdelibs/kio/kio
From:       Dawit Alemayehu <adawit () kde ! org>
Date:       2005-05-07 10:50:29
Message-ID: 1115463029.826685.29406.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 410264 by adawit:

Fix BR# 105206 (Konqueror proxy manual settings do not persist the proxy's exceptions)

BUGS:105206



 M  +7 -5      trunk/KDE/kdelibs/kio/kio/kprotocolmanager.cpp  


--- trunk/KDE/kdelibs/kio/kio/kprotocolmanager.cpp #410263:410264
@@ -208,9 +208,6 @@
 {
   KProtocolManager::ProxyType type = proxyType();
 
-  if ( (type != ManualProxy) && (type != EnvVarProxy) )
-    return QString::null;
-
   KConfig *cfg = config();
   cfg->setGroup( "Proxy Settings" );
 
@@ -350,9 +347,14 @@
      if ((proxy != "DIRECT") && (!proxy.isEmpty()))
      {
         bool isRevMatch = false;
-        bool useRevProxy = ((proxyType() == ManualProxy) && useReverseProxy());
+        KProtocolManager::ProxyType type = proxyType();
+        bool useRevProxy = ((type == ManualProxy) && useReverseProxy());
 
-        QString noProxy = noProxyFor();
+        QString noProxy;
+        // Check no proxy information iff the proxy type is either
+        // manual or environment variable based...
+        if ( (type == ManualProxy) || (type == EnvVarProxy) )
+          noProxy = noProxyFor();
 
         if (!noProxy.isEmpty())
         {
[prev in list] [next in list] [prev in thread] [next in thread]