diff options
author | mbelshe@chromium.org <mbelshe@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-25 19:25:04 +0000 |
---|---|---|
committer | mbelshe@chromium.org <mbelshe@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-25 19:25:04 +0000 |
commit | 8a1f331497a81bb929ab75a3cfc8b1b835e21bcd (patch) | |
tree | e608c6f36c92c0446ebf01899920d2b7d66f619f /net/base | |
parent | 6b8ab84aa5133fdb73add7ba1771559cbc3ffd4c (diff) | |
download | chromium_src-8a1f331497a81bb929ab75a3cfc8b1b835e21bcd.zip chromium_src-8a1f331497a81bb929ab75a3cfc8b1b835e21bcd.tar.gz chromium_src-8a1f331497a81bb929ab75a3cfc8b1b835e21bcd.tar.bz2 |
Eliminate the establishing_tunnel_ internal state and move to explicit
states in the state machine for proxy tunnel establishment.
Original work from svandebo.
BUG=none
TEST=existing
Review URL: http://codereview.chromium.org/2101014
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@48173 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/base')
-rw-r--r-- | net/base/load_states.h | 4 | ||||
-rw-r--r-- | net/base/net_log_event_type_list.h | 34 |
2 files changed, 24 insertions, 14 deletions
diff --git a/net/base/load_states.h b/net/base/load_states.h index 9555be9..cce9781 100644 --- a/net/base/load_states.h +++ b/net/base/load_states.h @@ -29,6 +29,10 @@ enum LoadState { // host before deciding what proxy to use. LOAD_STATE_RESOLVING_PROXY_FOR_URL, + // This state indicates that we're in the process of establishing a tunnel + // through the proxy server. + LOAD_STATE_ESTABLISHING_PROXY_TUNNEL, + // This state corresponds to a resource load that is blocked waiting for a // host name to be resolved. This could either indicate resolution of the // origin server corresponding to the resource or to the host name of a proxy diff --git a/net/base/net_log_event_type_list.h b/net/base/net_log_event_type_list.h index 30faee9..531a019 100644 --- a/net/base/net_log_event_type_list.h +++ b/net/base/net_log_event_type_list.h @@ -337,42 +337,48 @@ EVENT_TYPE(HTTP_CACHE_WAITING) // HttpNetworkTransaction // ------------------------------------------------------------------------ -// Measures the time taken to send the request to the server. -EVENT_TYPE(HTTP_TRANSACTION_SEND_REQUEST) +// Measures the time taken to send the tunnel request to the server. +EVENT_TYPE(HTTP_TRANSACTION_TUNNEL_SEND_REQUEST) -// This event is sent for a HTTP request. +// This event is sent for a tunnel request. // The following parameters are attached: // { // "line": <The HTTP request line, CRLF terminated>, // "headers": <The list of header:value pairs> // } -EVENT_TYPE(HTTP_TRANSACTION_SEND_REQUEST_HEADERS) +EVENT_TYPE(HTTP_TRANSACTION_SEND_TUNNEL_HEADERS) -// This event is sent for a tunnel request. +// Measures the time to read the tunnel response headers from the server. +EVENT_TYPE(HTTP_TRANSACTION_TUNNEL_READ_HEADERS) + +// This event is sent on receipt of the HTTP response headers to a tunnel +// request. // The following parameters are attached: // { -// "line": <The HTTP request line, CRLF terminated>, // "headers": <The list of header:value pairs> // } -EVENT_TYPE(HTTP_TRANSACTION_SEND_TUNNEL_HEADERS) +EVENT_TYPE(HTTP_TRANSACTION_READ_TUNNEL_RESPONSE_HEADERS) -// Measures the time to read HTTP response headers from the server. -EVENT_TYPE(HTTP_TRANSACTION_READ_HEADERS) +// Measures the time taken to send the request to the server. +EVENT_TYPE(HTTP_TRANSACTION_SEND_REQUEST) -// This event is sent on receipt of the HTTP response headers. +// This event is sent for a HTTP request. // The following parameters are attached: // { +// "line": <The HTTP request line, CRLF terminated>, // "headers": <The list of header:value pairs> // } -EVENT_TYPE(HTTP_TRANSACTION_READ_RESPONSE_HEADERS) +EVENT_TYPE(HTTP_TRANSACTION_SEND_REQUEST_HEADERS) -// This event is sent on receipt of the HTTP response headers to a tunnel -// request. +// Measures the time to read HTTP response headers from the server. +EVENT_TYPE(HTTP_TRANSACTION_READ_HEADERS) + +// This event is sent on receipt of the HTTP response headers. // The following parameters are attached: // { // "headers": <The list of header:value pairs> // } -EVENT_TYPE(HTTP_TRANSACTION_READ_TUNNEL_RESPONSE_HEADERS) +EVENT_TYPE(HTTP_TRANSACTION_READ_RESPONSE_HEADERS) // Measures the time to resolve the canonical name for HTTP Negotiate // authentication scheme. |