| Index: net/base/upload_data_stream.cc
|
| diff --git a/net/base/upload_data_stream.cc b/net/base/upload_data_stream.cc
|
| index d0f6ca75bec4ec454ab9e180c7614b0265a85f68..239053f2785106e553f9991b72e50c93c46224af 100644
|
| --- a/net/base/upload_data_stream.cc
|
| +++ b/net/base/upload_data_stream.cc
|
| @@ -81,7 +81,7 @@ int UploadDataStream::Read(IOBuffer* buf, int buf_len) {
|
| buf_len - bytes_copied);
|
|
|
| if (element.BytesRemaining() == 0)
|
| - ++element_index_;
|
| + ++element_index_;
|
|
|
| if (is_chunked() && !merge_chunks_)
|
| break;
|
| @@ -99,12 +99,9 @@ bool UploadDataStream::IsEOF() const {
|
|
|
| // Check if all elements are consumed.
|
| if (element_index_ == elements.size()) {
|
| - // If the upload data is chunked, check if the last element is the
|
| - // last chunk.
|
| - if (!upload_data_->is_chunked() ||
|
| - (!elements.empty() && elements.back().is_last_chunk())) {
|
| + // If the upload data is chunked, check if the last chunk is appended.
|
| + if (!upload_data_->is_chunked() || upload_data_->last_chunk_appended())
|
| return true;
|
| - }
|
| }
|
| return false;
|
| }
|
|
|