Chromium Code Reviews| Index: net/http/http_response_info.cc |
| diff --git a/net/http/http_response_info.cc b/net/http/http_response_info.cc |
| index 2c23faac4e1bb7e21ad81fa9cbd38e12f5b2beec..07067bea8c424928e3cbed9888694d65609634b6 100644 |
| --- a/net/http/http_response_info.cc |
| +++ b/net/http/http_response_info.cc |
| @@ -74,6 +74,7 @@ HttpResponseInfo::HttpResponseInfo(const HttpResponseInfo& rhs) |
| was_npn_negotiated(rhs.was_npn_negotiated), |
| was_alternate_protocol_available(rhs.was_alternate_protocol_available), |
| was_fetched_via_proxy(rhs.was_fetched_via_proxy), |
| + socket_address(rhs.socket_address), |
| request_time(rhs.request_time), |
| response_time(rhs.response_time), |
| auth_challenge(rhs.auth_challenge), |
| @@ -93,6 +94,7 @@ HttpResponseInfo& HttpResponseInfo::operator=(const HttpResponseInfo& rhs) { |
| was_npn_negotiated = rhs.was_npn_negotiated; |
| was_alternate_protocol_available = rhs.was_alternate_protocol_available; |
| was_fetched_via_proxy = rhs.was_fetched_via_proxy; |
| + socket_address = rhs.socket_address; |
| request_time = rhs.request_time; |
| response_time = rhs.response_time; |
| auth_challenge = rhs.auth_challenge; |
| @@ -158,6 +160,10 @@ bool HttpResponseInfo::InitFromPickle(const Pickle& pickle, |
| return false; |
| } |
| + // Read socket_address. This was not always present in the response info, |
| + // so we don't fail if it can't be read. |
|
pmarks
2011/02/11 00:36:39
I would add "If additional fields are added in a f
Brian Ryner
2011/02/11 23:01:07
Done.
|
| + pickle.ReadString(&iter, &socket_address); |
| + |
| was_fetched_via_spdy = (flags & RESPONSE_INFO_WAS_SPDY) != 0; |
| was_npn_negotiated = (flags & RESPONSE_INFO_WAS_NPN) != 0; |
| @@ -223,6 +229,8 @@ void HttpResponseInfo::Persist(Pickle* pickle, |
| if (vary_data.is_valid()) |
| vary_data.Persist(pickle); |
| + |
| + pickle->WriteString(socket_address); |
| } |
| } // namespace net |