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

Merge pull request #3531 from deepak1556/fetch_job_nocontent_patch

Browse source 
protocol: handle http responses with no content
This commit is contained in:
Cheng Zhao 2015-11-24 15:45:07 +08:00
commit fe88cb01fc
1 changed files with 13 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -181,6 +181,11 @@ void URLRequestFetchJob::Kill() {
bool URLRequestFetchJob::ReadRawData(net::IOBuffer* dest, bool URLRequestFetchJob::ReadRawData(net::IOBuffer* dest,
int dest_size, int dest_size,
int* bytes_read) { int* bytes_read) {
if (GetResponseCode() == 204) {
*bytes_read = 0;
request()->set_received_response_content_length(prefilter_bytes_read());
return true;
}
pending_buffer_ = dest; pending_buffer_ = dest;
pending_buffer_size_ = dest_size; pending_buffer_size_ = dest_size;
SetStatus(net::URLRequestStatus(net::URLRequestStatus::IO_PENDING, 0)); SetStatus(net::URLRequestStatus(net::URLRequestStatus::IO_PENDING, 0));
@ -207,6 +212,14 @@ int URLRequestFetchJob::GetResponseCode() const {
} }
void URLRequestFetchJob::OnURLFetchComplete(const net::URLFetcher* source) { void URLRequestFetchJob::OnURLFetchComplete(const net::URLFetcher* source) {
if (!response_info_) {
// Since we notify header completion only after first write there will be
// no response object constructed for http respones with no content 204.
// We notify header completion here.
HeadersCompleted();
return;
}
pending_buffer_ = nullptr; pending_buffer_ = nullptr;
pending_buffer_size_ = 0; pending_buffer_size_ = 0;
NotifyDone(fetcher_->GetStatus()); NotifyDone(fetcher_->GetStatus());