| 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/http/http_network_transaction.h" | 5 #include "net/http/http_network_transaction.h" |
| 6 | 6 |
| 7 #include <set> | 7 #include <set> |
| 8 #include <vector> | 8 #include <vector> |
| 9 | 9 |
| 10 #include "base/bind.h" | 10 #include "base/bind.h" |
| (...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 47 #include "net/http/http_stream.h" | 47 #include "net/http/http_stream.h" |
| 48 #include "net/http/http_stream_factory.h" | 48 #include "net/http/http_stream_factory.h" |
| 49 #include "net/http/http_util.h" | 49 #include "net/http/http_util.h" |
| 50 #include "net/http/transport_security_state.h" | 50 #include "net/http/transport_security_state.h" |
| 51 #include "net/http/url_security_manager.h" | 51 #include "net/http/url_security_manager.h" |
| 52 #include "net/socket/client_socket_factory.h" | 52 #include "net/socket/client_socket_factory.h" |
| 53 #include "net/socket/socks_client_socket_pool.h" | 53 #include "net/socket/socks_client_socket_pool.h" |
| 54 #include "net/socket/ssl_client_socket.h" | 54 #include "net/socket/ssl_client_socket.h" |
| 55 #include "net/socket/ssl_client_socket_pool.h" | 55 #include "net/socket/ssl_client_socket_pool.h" |
| 56 #include "net/socket/transport_client_socket_pool.h" | 56 #include "net/socket/transport_client_socket_pool.h" |
| 57 #include "net/spdy/hpack_huffman_aggregator.h" | |
| 58 #include "net/spdy/spdy_http_stream.h" | 57 #include "net/spdy/spdy_http_stream.h" |
| 59 #include "net/spdy/spdy_session.h" | 58 #include "net/spdy/spdy_session.h" |
| 60 #include "net/spdy/spdy_session_pool.h" | 59 #include "net/spdy/spdy_session_pool.h" |
| 61 #include "net/ssl/ssl_cert_request_info.h" | 60 #include "net/ssl/ssl_cert_request_info.h" |
| 62 #include "net/ssl/ssl_connection_status_flags.h" | 61 #include "net/ssl/ssl_connection_status_flags.h" |
| 63 #include "url/gurl.h" | 62 #include "url/gurl.h" |
| 64 #include "url/url_canon.h" | 63 #include "url/url_canon.h" |
| 65 | 64 |
| 66 namespace net { | 65 namespace net { |
| 67 | 66 |
| (...skipping 983 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1051 HostPortPair::FromURL(request_->url)); | 1050 HostPortPair::FromURL(request_->url)); |
| 1052 | 1051 |
| 1053 int rv = HandleAuthChallenge(); | 1052 int rv = HandleAuthChallenge(); |
| 1054 if (rv != OK) | 1053 if (rv != OK) |
| 1055 return rv; | 1054 return rv; |
| 1056 | 1055 |
| 1057 if (IsSecureRequest()) | 1056 if (IsSecureRequest()) |
| 1058 stream_->GetSSLInfo(&response_.ssl_info); | 1057 stream_->GetSSLInfo(&response_.ssl_info); |
| 1059 | 1058 |
| 1060 headers_valid_ = true; | 1059 headers_valid_ = true; |
| 1061 | |
| 1062 if (session_->huffman_aggregator()) { | |
| 1063 session_->huffman_aggregator()->AggregateTransactionCharacterCounts( | |
| 1064 *request_, | |
| 1065 request_headers_, | |
| 1066 proxy_info_.proxy_server(), | |
| 1067 *response_.headers.get()); | |
| 1068 } | |
| 1069 return OK; | 1060 return OK; |
| 1070 } | 1061 } |
| 1071 | 1062 |
| 1072 int HttpNetworkTransaction::DoReadBody() { | 1063 int HttpNetworkTransaction::DoReadBody() { |
| 1073 DCHECK(read_buf_.get()); | 1064 DCHECK(read_buf_.get()); |
| 1074 DCHECK_GT(read_buf_len_, 0); | 1065 DCHECK_GT(read_buf_len_, 0); |
| 1075 DCHECK(stream_ != NULL); | 1066 DCHECK(stream_ != NULL); |
| 1076 | 1067 |
| 1077 next_state_ = STATE_READ_BODY_COMPLETE; | 1068 next_state_ = STATE_READ_BODY_COMPLETE; |
| 1078 return stream_->ReadResponseBody( | 1069 return stream_->ReadResponseBody( |
| (...skipping 459 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1538 description = base::StringPrintf("Unknown state 0x%08X (%u)", state, | 1529 description = base::StringPrintf("Unknown state 0x%08X (%u)", state, |
| 1539 state); | 1530 state); |
| 1540 break; | 1531 break; |
| 1541 } | 1532 } |
| 1542 return description; | 1533 return description; |
| 1543 } | 1534 } |
| 1544 | 1535 |
| 1545 #undef STATE_CASE | 1536 #undef STATE_CASE |
| 1546 | 1537 |
| 1547 } // namespace net | 1538 } // namespace net |
| OLD | NEW |