Work around a multipart crash caused by sending

a response header immediately after sending data.

The work around is to be more aggressive about sending
multipart data before we have a response header.  We used
to buffer a response until we had the full frame.

This avoids a crash in webcore by behaving more like
CFNetwork.  It also makes us behave more like Gecko,
which is probably good for compat.

BUG=30880

Review URL: http://codereview.chromium.org/2070007

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@47599 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 12 insertions, 0 deletions

diff --git a/webkit/glue/multipart_response_delegate.cc b/webkit/glue/multipart_response_delegate.cc
index 8de6469..1b68064 100644
--- a/webkit/glue/multipart_response_delegate.cc
+++ b/webkit/glue/multipart_response_delegate.cc
@@ -149,6 +149,18 @@ void MultipartResponseDelegate::OnReceivedData(const char* data,
       break;
     }
   }
+
+  // At this point, we should send over any data we have, but keep enough data
+  // buffered to handle a boundary that may have been truncated.
+  if (!processing_headers_ && data_.length() > boundary_.length()) {
+    // If the last character is a new line character, go ahead and just send
+    // everything we have buffered.  This matches an optimization in Gecko.
+    int send_length = data_.length() - boundary_.length();
+    if (data_[data_.length() - 1] == '\n')
+      send_length = data_.length();
+    client_->didReceiveData(loader_, data_.data(), send_length);
+    data_ = data_.substr(send_length);
+  }
 }
 
 void MultipartResponseDelegate::OnCompletedRequest() {