mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

protocol: return status of ReadRawData instead of relying on SetStatus

Browse source
This commit is contained in:
deepak1556 2016-03-28 02:09:56 +05:30
parent 4a1e060832
commit 73201e419d
1 changed files with 2 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
atom/browser/net/url_request_fetch_job.cc
View file

@ -167,8 +167,6 @@ void URLRequestFetchJob::HeadersCompleted() {
} }
int URLRequestFetchJob::DataAvailable(net::IOBuffer* buffer, int num_bytes) { int URLRequestFetchJob::DataAvailable(net::IOBuffer* buffer, int num_bytes) {
// Clear the IO_PENDING status.
SetStatus(net::URLRequestStatus());
// Do nothing if pending_buffer_ is empty, i.e. there's no ReadRawData() // Do nothing if pending_buffer_ is empty, i.e. there's no ReadRawData()
// operation waiting for IO completion. // operation waiting for IO completion.
if (!pending_buffer_.get()) if (!pending_buffer_.get())
@ -176,7 +174,6 @@ int URLRequestFetchJob::DataAvailable(net::IOBuffer* buffer, int num_bytes) {
// pending_buffer_ is set to the IOBuffer instance provided to ReadRawData() // pending_buffer_ is set to the IOBuffer instance provided to ReadRawData()
// by URLRequestJob. // by URLRequestJob.
int bytes_read = std::min(num_bytes, pending_buffer_size_); int bytes_read = std::min(num_bytes, pending_buffer_size_);
memcpy(pending_buffer_->data(), buffer->data(), bytes_read); memcpy(pending_buffer_->data(), buffer->data(), bytes_read);
@ -197,12 +194,11 @@ void URLRequestFetchJob::Kill() {
int URLRequestFetchJob::ReadRawData(net::IOBuffer* dest, int dest_size) { int URLRequestFetchJob::ReadRawData(net::IOBuffer* dest, int dest_size) {
if (GetResponseCode() == 204) { if (GetResponseCode() == 204) {
request()->set_received_response_content_length(prefilter_bytes_read()); request()->set_received_response_content_length(prefilter_bytes_read());
return 0; return net::OK;
} }
pending_buffer_ = dest; pending_buffer_ = dest;
pending_buffer_size_ = dest_size; pending_buffer_size_ = dest_size;
SetStatus(net::URLRequestStatus(net::URLRequestStatus::IO_PENDING, 0)); return net::ERR_IO_PENDING;
return dest_size;
} }
bool URLRequestFetchJob::GetMimeType(std::string* mime_type) const { bool URLRequestFetchJob::GetMimeType(std::string* mime_type) const {