Changeset 69064 in webkit

Timestamp:

Oct 4, 2010 9:16:20 PM (14 years ago)

Author:

commit-queue@webkit.org

Message:

2010-10-04 Sriram Neelakandan <​sriram.neelakandan@gmail.com>

Reviewed by Andreas Kling.

[Qt] QNetworkReplyHandler forces buffered output for FormData with files
​https://bugs.webkit.org/show_bug.cgi?id=46259

No new tests. Existing form submit tests should cover this change.

• platform/network/qt/QNetworkReplyHandler.cpp: (WebCore::FormDataIODevice::FormDataIODevice): (WebCore::FormDataIODevice::computeSize): Add computeSize() for computing form device size (WebCore::QNetworkReplyHandler::start): Call computeSize(), fill Content-Length and prevent UploadData buffering
• platform/network/qt/QNetworkReplyHandler.h: (WebCore::FormDataIODevice::getFormDataSize):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/network/qt/QNetworkReplyHandler.cpp (modified) (6 diffs)
• platform/network/qt/QNetworkReplyHandler.h (modified) (3 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-10-04  Sriram Neelakandan  <sriram.neelakandan@gmail.com>
+
+        Reviewed by Andreas Kling.
+
+        [Qt] QNetworkReplyHandler forces buffered output for FormData with files
+        https://bugs.webkit.org/show_bug.cgi?id=46259
+
+        No new tests. Existing form submit tests should cover this change.
+
+        * platform/network/qt/QNetworkReplyHandler.cpp:
+        (WebCore::FormDataIODevice::FormDataIODevice):
+        (WebCore::FormDataIODevice::computeSize):
+         Add computeSize() for computing form device size
+        (WebCore::QNetworkReplyHandler::start):
+         Call computeSize(), fill Content-Length and prevent UploadData buffering
+        * platform/network/qt/QNetworkReplyHandler.h:
+        (WebCore::FormDataIODevice::getFormDataSize):
+
 2010-10-04  Chang Shu  <chang.shu@nokia.com>
 

trunk/WebCore/platform/network/qt/QNetworkReplyHandler.cpp

@@ -31 +31 @@
 #include <QDateTime>
 #include <QFile>
+#include <QFileInfo>
 #include <QNetworkReply>
 #include <QNetworkCookie>
@@ -60 +61 @@
     , m_currentFile(0)
     , m_currentDelta(0)
+    , m_fileSize(0)
+    , m_dataSize(0)
 {
     setOpenMode(FormDataIODevice::ReadOnly);
@@ -65 +68 @@
     if (!m_formElements.isEmpty() && m_formElements[0].m_type == FormDataElement::encodedFile)
         openFileForCurrentElement();
+    computeSize();
 }
 
@@ -70 +74 @@
 {
     delete m_currentFile;
+}
+
+qint64 FormDataIODevice::computeSize() 
+{
+    for (int i = 0; i < m_formElements.size(); ++i) {
+        const FormDataElement& element = m_formElements[i];
+        if (element.m_type == FormDataElement::data) 
+            m_dataSize += element.m_data.size();
+        else {
+            QFileInfo fi(element.m_filename);
+            m_fileSize += fi.size();
+        }
+    }
+    return m_dataSize + m_fileSize;
 }
 
@@ -482 +500 @@
         case QNetworkAccessManager::PostOperation: {
             FormDataIODevice* postDevice = new FormDataIODevice(d->m_firstRequest.httpBody()); 
+            // We may be uploading files so prevent QNR from buffering data
+            m_request.setHeader(QNetworkRequest::ContentLengthHeader, postDevice->getFormDataSize());
+            m_request.setAttribute(QNetworkRequest::DoNotBufferUploadDataAttribute, QVariant(true));
             m_reply = manager->post(m_request, postDevice);
             postDevice->setParent(m_reply);
@@ -491 +512 @@
         case QNetworkAccessManager::PutOperation: {
             FormDataIODevice* putDevice = new FormDataIODevice(d->m_firstRequest.httpBody()); 
+            // We may be uploading files so prevent QNR from buffering data
+            m_request.setHeader(QNetworkRequest::ContentLengthHeader, putDevice->getFormDataSize());
+            m_request.setAttribute(QNetworkRequest::DoNotBufferUploadDataAttribute, QVariant(true));
             m_reply = manager->put(m_request, putDevice);
             putDevice->setParent(m_reply);

trunk/WebCore/platform/network/qt/QNetworkReplyHandler.h

@@ -98 +98 @@
 
     bool isSequential() const;
+    qint64 getFormDataSize() const { return m_fileSize + m_dataSize; }
 
 protected:
@@ -105 +106 @@
 private:
     void moveToNextElement();
+    qint64 computeSize();
     void openFileForCurrentElement();
 
@@ -111 +113 @@
     QFile* m_currentFile;
     qint64 m_currentDelta;
+    qint64 m_fileSize;
+    qint64 m_dataSize;
 };