Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(528)

Unified Diff: components/cronet/ios/cronet_bidirectional_stream.cc

Issue 2128633004: [Cronet] Don't send endOfStream if there is pending data to flush on iOS. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Sync Created 4 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | components/cronet/ios/test/cronet_bidirectional_stream_test.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/cronet/ios/cronet_bidirectional_stream.cc
diff --git a/components/cronet/ios/cronet_bidirectional_stream.cc b/components/cronet/ios/cronet_bidirectional_stream.cc
index dcaf9af6b6959bf0f5ec75fbbc268a571cc3870a..59a82085f8f268df0e99e330369c0642d2497126 100644
--- a/components/cronet/ios/cronet_bidirectional_stream.cc
+++ b/components/cronet/ios/cronet_bidirectional_stream.cc
@@ -220,9 +220,10 @@ void CronetBidirectionalStream::OnDataSent() {
SendFlushingWriteData();
return;
}
- if (write_end_of_stream_ && pending_write_data_->Empty())
+ if (write_end_of_stream_ && pending_write_data_->Empty()) {
write_state_ = WRITING_DONE;
- MaybeOnSucceded();
+ MaybeOnSucceded();
+ }
}
void CronetBidirectionalStream::OnTrailersReceived(
@@ -333,7 +334,8 @@ void CronetBidirectionalStream::SendFlushingWriteData() {
write_state_ = WRITING;
flushing_write_data_->MoveTo(sending_write_data_.get());
bidi_stream_->SendvData(sending_write_data_->buffers(),
- sending_write_data_->lengths(), write_end_of_stream_);
+ sending_write_data_->lengths(),
+ write_end_of_stream_ && pending_write_data_->Empty());
}
void CronetBidirectionalStream::CancelOnNetworkThread() {
« no previous file with comments | « no previous file | components/cronet/ios/test/cronet_bidirectional_stream_test.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698