If a write is pending, just add it to the buffer. Don't trigger a second concurrent write.

BUG=http://crbug.com/17991
TEST=as in bug

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

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

1 files changed, 11 insertions, 0 deletions

diff --git a/net/socket/ssl_client_socket_mac.cc b/net/socket/ssl_client_socket_mac.cc
index db42c1a..6061dde 100644
--- a/net/socket/ssl_client_socket_mac.cc
+++ b/net/socket/ssl_client_socket_mac.cc
@@ -736,10 +736,21 @@ OSStatus SSLClientSocketMac::SSLWriteCallback(SSLConnectionRef connection,
     return status;
   }
 
+  bool send_pending = !us->send_buffer_.empty();
+
   if (data)
     us->send_buffer_.insert(us->send_buffer_.end(),
                             static_cast<const char*>(data),
                             static_cast<const char*>(data) + *data_length);
+
+  if (send_pending) {
+    // If we have I/O in flight, just add the data to the end of the buffer and
+    // return to our caller. The existing callback will trigger the write of the
+    // new data when it sees that data remains in the buffer after removing the
+    // sent data. As always, lie to our caller.
+    return noErr;
+  }
+
   int rv;
   do {
     scoped_refptr<IOBuffer> buffer = new IOBuffer(us->send_buffer_.size());