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

List:       kde-core-devel
Subject:    Re: [patch] Making KDE work with (web based) proxy scripts again
From:       Scott Wheeler <wheeler () kde ! org>
Date:       2004-01-14 12:02:40
Message-ID: 200401141302.40855.wheeler () kde ! org
[Download RAW message or body]

On Wednesday 14 January 2004 04:02, Dawit A. wrote:

> That is fine. I am more worried about discovering the actual cause of this
> problem...

[...]

> Can you please add a debug statement and see what the values of both of
> those URLs are ? Thanks...

Yep, my hunch was right.  The trailing slash was showing up there:

kded: url = http://proxy:8083/, m_downloader->scriptURL() = http://proxy:8083


I'm attaching a patch where I revert my KProtocolManager change from yesterday 
and add the equivalent in the ProxyScout.  Ok to commit?

-Scott

-- 
Peace and humptiness forever.
--Digital Underground

["fix-proxy-config-2.patch" (text/x-diff)]

Index: kio/kprotocolmanager.cpp
===================================================================
RCS file: /home/kde/kdelibs/kio/kio/kprotocolmanager.cpp,v
retrieving revision 1.135
diff -u -3 -p -r1.135 kprotocolmanager.cpp
--- kio/kprotocolmanager.cpp	13 Jan 2004 22:08:31 -0000	1.135
+++ kio/kprotocolmanager.cpp	14 Jan 2004 11:53:02 -0000
@@ -245,8 +245,7 @@ QString KProtocolManager::proxyForURL( c
           if (!url.host().isEmpty())
           {
             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 );
           }
           break;
Index: misc/kpac/proxyscout.cpp
===================================================================
RCS file: /home/kde/kdelibs/kio/misc/kpac/proxyscout.cpp,v
retrieving revision 1.4
diff -u -3 -p -r1.4 proxyscout.cpp
--- misc/kpac/proxyscout.cpp	5 Jan 2004 03:20:40 -0000	1.4
+++ misc/kpac/proxyscout.cpp	14 Jan 2004 11:53:02 -0000
@@ -63,7 +63,7 @@ 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]