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

List:       kde-commits
Subject:    =?utf-8?q?=5Bkdelibs/KDE/4=2E6=5D_kio/kio=3A_Make_sure_that_unkn?=
From:       Dawit Alemayehu <adawit () kde ! org>
Date:       2011-03-10 22:14:33
Message-ID: 20110310221433.3EE24A60A6 () git ! kde ! org
[Download RAW message or body]

Git commit c7ed1a01fc32c999664fd316613a09f87d16482d by Dawit Alemayehu.
Committed on 10/03/2011 at 23:10.
Pushed by adawit into branch 'KDE/4.6'.

Make sure that unknown protocols are not returned as a valid slave protocols.
This change prevents things like a FTP over SOCKS proxy request from being
incorrectly handled by the http ioslave.

M  +2    -1    kio/kio/kprotocolmanager.cpp     

http://commits.kde.org/kdelibs/c7ed1a01fc32c999664fd316613a09f87d16482d

diff --git a/kio/kio/kprotocolmanager.cpp b/kio/kio/kprotocolmanager.cpp
index 67a04e4..56e1942 100644
--- a/kio/kio/kprotocolmanager.cpp
+++ b/kio/kio/kprotocolmanager.cpp
@@ -404,7 +404,8 @@ QString KProtocolManager::slaveProtocol(const KUrl &url, QString &proxy)
               // The idea behind slave protocols is not applicable to http
               // and webdav protocols.
               const QString protocol = url.protocol().toLower();
-              if (protocol.startsWith(QL1S("http")) || protocol.startsWith(QL1S("webdav")))
+              if (protocol.startsWith(QL1S("http")) || protocol.startsWith(QL1S("webdav")) ||
+                  !KProtocolInfo::isKnownProtocol(protocol))
                 d->protocol = protocol;
               else
               {


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