OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "net/url_request/url_request_job.h" | 5 #include "net/url_request/url_request_job.h" |
6 | 6 |
7 #include "base/bind.h" | 7 #include "base/bind.h" |
8 #include "base/compiler_specific.h" | 8 #include "base/compiler_specific.h" |
9 #include "base/message_loop/message_loop.h" | 9 #include "base/message_loop/message_loop.h" |
10 #include "base/power_monitor/power_monitor.h" | 10 #include "base/power_monitor/power_monitor.h" |
11 #include "base/profiler/scoped_tracker.h" | 11 #include "base/profiler/scoped_tracker.h" |
12 #include "base/strings/string_number_conversions.h" | 12 #include "base/strings/string_number_conversions.h" |
13 #include "base/strings/string_util.h" | 13 #include "base/strings/string_util.h" |
14 #include "base/values.h" | 14 #include "base/values.h" |
15 #include "net/base/auth.h" | 15 #include "net/base/auth.h" |
16 #include "net/base/host_port_pair.h" | 16 #include "net/base/host_port_pair.h" |
17 #include "net/base/io_buffer.h" | 17 #include "net/base/io_buffer.h" |
18 #include "net/base/load_states.h" | 18 #include "net/base/load_states.h" |
19 #include "net/base/net_errors.h" | 19 #include "net/base/net_errors.h" |
20 #include "net/base/network_delegate.h" | 20 #include "net/base/network_delegate.h" |
21 #include "net/filter/filter.h" | 21 #include "net/filter/filter.h" |
22 #include "net/http/http_response_headers.h" | 22 #include "net/http/http_response_headers.h" |
23 | 23 |
24 namespace net { | 24 namespace net { |
25 | 25 |
26 namespace { | 26 namespace { |
27 | 27 |
28 // Callback for TYPE_URL_REQUEST_FILTERS_SET net-internals event. | 28 // Callback for TYPE_URL_REQUEST_FILTERS_SET net-internals event. |
29 base::Value* FiltersSetCallback(Filter* filter, | 29 base::Value* FiltersSetCallback(Filter* filter, |
30 NetLog::LogLevel /* log_level */) { | 30 NetLogCaptureMode /* capture_mode */) { |
31 base::DictionaryValue* event_params = new base::DictionaryValue(); | 31 base::DictionaryValue* event_params = new base::DictionaryValue(); |
32 event_params->SetString("filters", filter->OrderedFilterList()); | 32 event_params->SetString("filters", filter->OrderedFilterList()); |
33 return event_params; | 33 return event_params; |
34 } | 34 } |
35 | 35 |
36 std::string ComputeMethodForRedirect(const std::string& method, | 36 std::string ComputeMethodForRedirect(const std::string& method, |
37 int http_status_code) { | 37 int http_status_code) { |
38 // For 303 redirects, all request methods except HEAD are converted to GET, | 38 // For 303 redirects, all request methods except HEAD are converted to GET, |
39 // as per the latest httpbis draft. The draft also allows POST requests to | 39 // as per the latest httpbis draft. The draft also allows POST requests to |
40 // be converted to GETs when following 301/302 redirects, for historical | 40 // be converted to GETs when following 301/302 redirects, for historical |
(...skipping 721 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
762 } | 762 } |
763 default: { | 763 default: { |
764 NOTREACHED(); | 764 NOTREACHED(); |
765 filter_needs_more_output_space_ = false; | 765 filter_needs_more_output_space_ = false; |
766 rv = false; | 766 rv = false; |
767 break; | 767 break; |
768 } | 768 } |
769 } | 769 } |
770 | 770 |
771 // If logging all bytes is enabled, log the filtered bytes read. | 771 // If logging all bytes is enabled, log the filtered bytes read. |
772 if (rv && request() && request()->net_log().IsLoggingBytes() && | 772 if (rv && request() && |
| 773 request()->net_log().GetCaptureMode().include_socket_bytes() && |
773 filtered_data_len > 0) { | 774 filtered_data_len > 0) { |
774 request()->net_log().AddByteTransferEvent( | 775 request()->net_log().AddByteTransferEvent( |
775 NetLog::TYPE_URL_REQUEST_JOB_FILTERED_BYTES_READ, | 776 NetLog::TYPE_URL_REQUEST_JOB_FILTERED_BYTES_READ, |
776 filtered_data_len, filtered_read_buffer_->data()); | 777 filtered_data_len, filtered_read_buffer_->data()); |
777 } | 778 } |
778 } else { | 779 } else { |
779 // we are done, or there is no data left. | 780 // we are done, or there is no data left. |
780 rv = true; | 781 rv = true; |
781 } | 782 } |
782 break; | 783 break; |
(...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
863 | 864 |
864 void URLRequestJob::FollowRedirect(const RedirectInfo& redirect_info) { | 865 void URLRequestJob::FollowRedirect(const RedirectInfo& redirect_info) { |
865 int rv = request_->Redirect(redirect_info); | 866 int rv = request_->Redirect(redirect_info); |
866 if (rv != OK) | 867 if (rv != OK) |
867 NotifyDone(URLRequestStatus(URLRequestStatus::FAILED, rv)); | 868 NotifyDone(URLRequestStatus(URLRequestStatus::FAILED, rv)); |
868 } | 869 } |
869 | 870 |
870 void URLRequestJob::OnRawReadComplete(int bytes_read) { | 871 void URLRequestJob::OnRawReadComplete(int bytes_read) { |
871 DCHECK(raw_read_buffer_.get()); | 872 DCHECK(raw_read_buffer_.get()); |
872 // If |filter_| is non-NULL, bytes will be logged after it is applied instead. | 873 // If |filter_| is non-NULL, bytes will be logged after it is applied instead. |
873 if (!filter_.get() && request() && request()->net_log().IsLoggingBytes() && | 874 if (!filter_.get() && request() && |
| 875 request()->net_log().GetCaptureMode().include_socket_bytes() && |
874 bytes_read > 0) { | 876 bytes_read > 0) { |
875 request()->net_log().AddByteTransferEvent( | 877 request()->net_log().AddByteTransferEvent( |
876 NetLog::TYPE_URL_REQUEST_JOB_BYTES_READ, | 878 NetLog::TYPE_URL_REQUEST_JOB_BYTES_READ, |
877 bytes_read, raw_read_buffer_->data()); | 879 bytes_read, raw_read_buffer_->data()); |
878 } | 880 } |
879 | 881 |
880 if (bytes_read > 0) { | 882 if (bytes_read > 0) { |
881 RecordBytesRead(bytes_read); | 883 RecordBytesRead(bytes_read); |
882 } | 884 } |
883 raw_read_buffer_ = NULL; | 885 raw_read_buffer_ = NULL; |
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
949 // Alter the referrer if redirecting cross-origin (especially HTTP->HTTPS). | 951 // Alter the referrer if redirecting cross-origin (especially HTTP->HTTPS). |
950 redirect_info.new_referrer = | 952 redirect_info.new_referrer = |
951 ComputeReferrerForRedirect(request_->referrer_policy(), | 953 ComputeReferrerForRedirect(request_->referrer_policy(), |
952 request_->referrer(), | 954 request_->referrer(), |
953 redirect_info.new_url).spec(); | 955 redirect_info.new_url).spec(); |
954 | 956 |
955 return redirect_info; | 957 return redirect_info; |
956 } | 958 } |
957 | 959 |
958 } // namespace net | 960 } // namespace net |
OLD | NEW |