[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_Consider_data=3A_UR?=
From:       Volker Krause <vkrause () kde ! org>
Date:       2011-04-17 11:38:46
Message-ID: 20110417113846.876D1A609B () git ! kde ! org
[Download RAW message or body]

Git commit a3297d274843c22ee8f5c4ede64f9c62311ade37 by Volker Krause.
Committed on 17/04/2011 at 13:17.
Pushed by vkrause into branch 'KDE/4.6'.

Consider data: URLs local in KIO::AccessManager.

Currently KIO::AccessManager blocks retrieval of embedded data: URLs if
external references are disabled. This does not match the behavior of KHTML
and breaks for example the display of sender photos/logos in KMail.

REVIEW: 101140

M  +2    -2    kio/kio/accessmanager.cpp     

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

diff --git a/kio/kio/accessmanager.cpp b/kio/kio/accessmanager.cpp
index 677f121..48dda75 100644
--- a/kio/kio/accessmanager.cpp
+++ b/kio/kio/accessmanager.cpp
@@ -50,8 +50,8 @@
 static bool isLocalRequest(const KUrl& url)
 {
     const QString scheme (url.protocol());
-    return (KProtocolInfo::isKnownProtocol(scheme) && 
-            KProtocolInfo::protocolClass(scheme).compare(QL1S(":local"), \
Qt::CaseInsensitive) == 0); +    return (KProtocolInfo::isKnownProtocol(scheme) &&
+            (KProtocolInfo::protocolClass(scheme).compare(QL1S(":local"), \
Qt::CaseInsensitive) == 0 || scheme == QL1S("data")));  }
 
 namespace KIO {


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