Patch from Eli Fidler to properly decode data: urls.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@24124 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitQt/Api/qwebnetworkinterface.cpp b/WebKitQt/Api/qwebnetworkinterface.cpp
index 5c7302f4df1f4d3e68da869a0d535afdba730e74..99c265e4c4089984c7166a269aae00a5ac0a6ab1 100644 (file)
--- a/WebKitQt/Api/qwebnetworkinterface.cpp
+++ b/WebKitQt/Api/qwebnetworkinterface.cpp
@@ -1,6 +1,7 @@
 /*
   Copyright (C) 2006 Enrico Ros <enrico.ros@m31engineering.it>
   Copyright (C) 2007 Trolltech ASA
+  Copyright (C) 2007 Staikos Computing Services Inc.  <info@staikos.net>
   
   This library is free software; you can redistribute it and/or
   modify it under the terms of the GNU Library General Public
@@ -622,8 +623,7 @@ void QWebNetworkInterfacePrivate::parseDataUrl(QWebNetworkJob* job)
 
     int index = data.indexOf(',');
     if (index != -1) {
-        header = data.mid(5, index - 5);
-        header = header.toLower();
+        header = data.mid(5, index - 5).toLower();
         //qDebug() << "header=" << header;
         data = data.mid(index+1);
         //qDebug() << "data=" << data;
@@ -633,14 +633,13 @@ void QWebNetworkInterfacePrivate::parseDataUrl(QWebNetworkJob* job)
             base64 = true;
             header = header.left(header.length() - 7);
             //qDebug() << "mime=" << header;
-        }        
+        }
     } else {
         data = QByteArray();
     }
+    data = QUrl::fromPercentEncoding(data).toLatin1();
     if (base64) {
         data = QByteArray::fromBase64(data);
-    } else {
-        data = QUrl::fromPercentEncoding(data).toLatin1();
     }
 
     if (header.isEmpty()) 

diff --git a/WebKitQt/ChangeLog b/WebKitQt/ChangeLog
index a1a0b631f72bb48c0b86a9639efbd94e143e85d8..a57282bf6d7b86fb9b9b0f331cc3f6b464ced5ab 100644 (file)
--- a/WebKitQt/ChangeLog
+++ b/WebKitQt/ChangeLog
@@ -1,3 +1,12 @@
+2007-07-10  Eli Fidler  <eli@staikos.net>
+
+        Reviewed by George Staikos.
+
+        Properly url-decode data urls.
+
+        * Api/qwebnetworkinterface.cpp:
+        (QWebNetworkInterfacePrivate::parseDataUrl):
+
 2007-07-09  Adam Treat  <adam@staikos.net>
 
         Reviewed by George Staikos.