diff options
| author | eroman@chromium.org <eroman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-31 21:07:33 +0000 |
|---|---|---|
| committer | eroman@chromium.org <eroman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-31 21:07:33 +0000 |
| commit | 095c7cfacf4a59d5241a17207d7a8a8096469334 (patch) | |
| tree | 7eb71d968ae4dc9705ba5e9c5ad1b1727f34b2fc /net/http | |
| parent | 701142a4edf3872fc9b433b68bdaf2c0a3c22db8 (diff) | |
| download | chromium_src-095c7cfacf4a59d5241a17207d7a8a8096469334.zip chromium_src-095c7cfacf4a59d5241a17207d7a8a8096469334.tar.gz chromium_src-095c7cfacf4a59d5241a17207d7a8a8096469334.tar.bz2 | |
Fix a regression whereby full-granularity network events were being captured by PassiveLogCollector.
BUG=53883
TEST=Load a webpage. Now open about:net-internals and verify that the log for that URL does NOT contain the HTTP request/response headers.
Review URL: http://codereview.chromium.org/3274016
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@58070 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/http')
| -rw-r--r-- | net/http/http_network_transaction.cc | 4 | ||||
| -rw-r--r-- | net/http/http_proxy_client_socket.cc | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/net/http/http_network_transaction.cc b/net/http/http_network_transaction.cc index 1dad416..aec4977 100644 --- a/net/http/http_network_transaction.cc +++ b/net/http/http_network_transaction.cc @@ -688,7 +688,7 @@ int HttpNetworkTransaction::DoSendRequest() { if (session_->network_delegate()) session_->network_delegate()->OnSendHttpRequest(&request_headers); - if (net_log_.HasListener()) { + if (net_log_.IsLoggingAll()) { net_log_.AddEvent( NetLog::TYPE_HTTP_TRANSACTION_SEND_REQUEST_HEADERS, new NetLogHttpRequestParameter(request_line, request_headers)); @@ -784,7 +784,7 @@ int HttpNetworkTransaction::DoReadHeadersComplete(int result) { return rv; } - if (net_log_.HasListener()) { + if (net_log_.IsLoggingAll()) { net_log_.AddEvent( NetLog::TYPE_HTTP_TRANSACTION_READ_RESPONSE_HEADERS, new NetLogHttpResponseParameter(response_.headers)); diff --git a/net/http/http_proxy_client_socket.cc b/net/http/http_proxy_client_socket.cc index 16f6e28..7ed80a5 100644 --- a/net/http/http_proxy_client_socket.cc +++ b/net/http/http_proxy_client_socket.cc @@ -337,7 +337,7 @@ int HttpProxyClientSocket::DoSendRequest() { HttpRequestHeaders request_headers; BuildTunnelRequest(&request_, authorization_headers, endpoint_, &request_line, &request_headers); - if (net_log_.HasListener()) { + if (net_log_.IsLoggingAll()) { net_log_.AddEvent( NetLog::TYPE_HTTP_TRANSACTION_SEND_TUNNEL_HEADERS, new NetLogHttpRequestParameter( @@ -373,7 +373,7 @@ int HttpProxyClientSocket::DoReadHeadersComplete(int result) { if (response_.headers->GetParsedHttpVersion() < HttpVersion(1, 0)) return ERR_TUNNEL_CONNECTION_FAILED; - if (net_log_.HasListener()) { + if (net_log_.IsLoggingAll()) { net_log_.AddEvent( NetLog::TYPE_HTTP_TRANSACTION_READ_TUNNEL_RESPONSE_HEADERS, new NetLogHttpResponseParameter(response_.headers)); |