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

List:       kde-commits
Subject:    kdelibs/kio
From:       Scott Wheeler <wheeler () kde ! org>
Date:       2004-01-15 22:01:43
Message-ID: 20040115220143.6DCF09061 () office ! kde ! org
[Download RAW message or body]

CVS commit by wheeler: 

Now the correct fix for the proxy resolution stuff.  This makes sure that
the comparison for finding the proxy for a given URL isn't the same as the
proxy configuration URL.  This version makes it ignore a trailing "/" at
the end of the URLs (and reverts my earlier change to do the same in the
wrong place).

Approved by Dawit A

CCMAIL:69026@bugs.kde.org


  M +1 -2      kio/kprotocolmanager.cpp   1.136
  M +1 -1      misc/kpac/proxyscout.cpp   1.5


--- kdelibs/kio/kio/kprotocolmanager.cpp  #1.135:1.136
@@ -246,6 +246,5 @@ QString KProtocolManager::proxyForURL( c
           {
             QString p = url.protocol();
-            if ( ( p.startsWith( "http" ) || p == "ftp" || p == "gopher" ) &&
-                 ! url.equals( proxyConfigScript(), true ) )
+            if ( p.startsWith( "http" ) || p == "ftp" || p == "gopher" )
               DCOPRef( "kded", "proxyscout" ).call( "proxyForURL", url ).get( proxy );
           }

--- kdelibs/kio/misc/kpac/proxyscout.cpp  #1.4:1.5
@@ -64,5 +64,5 @@ namespace KPAC
 
         // Never use a proxy for the script itself
-        if ( m_downloader && url == m_downloader->scriptURL() ) return "DIRECT";
+        if ( m_downloader && url.equals( m_downloader->scriptURL(), true ) ) return "DIRECT";
 
         if ( m_script ) return handleRequest( url );


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