Imported WebKit commit fce473cb4d55aa9fe9d0b0322a2fffecb731b961 (http://svn.webkit.org/repository/webkit/trunk@106560)

1 files changed, 6 insertions, 21 deletions

diff --git a/Source/WebKit2/WebProcess/qt/QtNetworkReply.cpp b/Source/WebKit2/WebProcess/qt/QtNetworkReply.cpp
index fd0f5cb7a..e65022cdf 100644
--- a/Source/WebKit2/WebProcess/qt/QtNetworkReply.cpp
+++ b/Source/WebKit2/WebProcess/qt/QtNetworkReply.cpp
@@ -45,11 +45,12 @@ QtNetworkReply::QtNetworkReply(const QNetworkRequest& req, QtNetworkAccessManage
     setOperation(QNetworkAccessManager::GetOperation);
     setUrl(req.url());
     setOpenMode(QIODevice::ReadOnly);
-    setHeader(QNetworkRequest::ContentTypeHeader, QVariant(QString::fromLocal8Bit("text/html; charset=UTF-16")));
 }
 
 void QtNetworkReply::setData(const SharedMemory::Handle& handle, qint64 dataSize)
 {
+    if (handle.isNull())
+        return;
     m_sharedMemory = SharedMemory::create(handle, SharedMemory::ReadOnly);
     if (!m_sharedMemory)
         return;
@@ -60,28 +61,17 @@ void QtNetworkReply::setData(const SharedMemory::Handle& handle, qint64 dataSize
 
 void QtNetworkReply::setReplyData(const QtNetworkReplyData& replyData)
 {
-    if (replyData.m_operation)
-        setOperation(replyData.m_operation);
-    if (!replyData.m_contentDisposition.isNull())
-        setHeader(QNetworkRequest::ContentDispositionHeader, QString(replyData.m_contentDisposition));
-    if (!replyData.m_contentType.isNull())
+    if (!replyData.m_contentType.isEmpty())
         setHeader(QNetworkRequest::ContentTypeHeader, QString(replyData.m_contentType));
-    if (!replyData.m_location.isNull())
-        setHeader(QNetworkRequest::LocationHeader, QString(replyData.m_location));
-    if (replyData.m_lastModified)
-        setHeader(QNetworkRequest::LastModifiedHeader, QDateTime::fromMSecsSinceEpoch(replyData.m_lastModified));
-    if (!replyData.m_cookie.isNull())
-        setHeader(QNetworkRequest::SetCookieHeader, QVariant::fromValue(QNetworkCookie::parseCookies(QString(replyData.m_cookie).toAscii())));
-    if (!replyData.m_userAgent.isNull())
-        setHeader(QNetworkRequest::UserAgentHeader, QString(replyData.m_userAgent));
-    if (!replyData.m_server.isNull())
-        setHeader(QNetworkRequest::ServerHeader, QString(replyData.m_server));
     setHeader(QNetworkRequest::ContentLengthHeader, QVariant::fromValue(replyData.m_contentLength));
     setData(replyData.m_dataHandle, replyData.m_contentLength);
 }
 
 qint64 QtNetworkReply::readData(char* data, qint64 maxlen)
 {
+    if (!m_sharedMemory)
+        return 0;
+
     qint64 bytesRead = maxlen < m_bytesAvailable ? maxlen : m_bytesAvailable;
     if (qMemCopy(data, static_cast<char*>(m_sharedMemory->data()) + m_sharedMemorySize - m_bytesAvailable, bytesRead)) {
         m_bytesAvailable -= bytesRead;
@@ -95,11 +85,6 @@ qint64 QtNetworkReply::bytesAvailable() const
     return m_bytesAvailable + QNetworkReply::bytesAvailable();
 }
 
-void QtNetworkReply::setHeader(QNetworkRequest::KnownHeaders header, const QVariant &value)
-{
-    QNetworkReply::setHeader(header, value);
-}
-
 void QtNetworkReply::abort() { }
 void QtNetworkReply::close() { }
 void QtNetworkReply::setReadBufferSize(qint64 size) { }