diff options
| author | jochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-07 08:10:14 +0000 |
|---|---|---|
| committer | jochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-07 08:10:14 +0000 |
| commit | 0107e570df7dece5fee0c34cc023c311dd7a5799 (patch) | |
| tree | 020653e32f95df1033b6f4ce45c7170f142da684 /net/url_request | |
| parent | e088e2922e961659768eb406714cac79e021e5fc (diff) | |
| download | chromium_src-0107e570df7dece5fee0c34cc023c311dd7a5799.zip chromium_src-0107e570df7dece5fee0c34cc023c311dd7a5799.tar.gz chromium_src-0107e570df7dece5fee0c34cc023c311dd7a5799.tar.bz2 | |
Revert 77075 - Don't block on stream requests on Alternate-Protocol.
Basically, after we get an HTTP header giving an Alternate-Protocol, we'll end up in a state where we're probably going to issue more HTTP requests. We have the already warm single HTTP connection. We probably don't have a SPDY session open. Previously, once we notice Alternate-Protocol, we'd block on trying to set up the new SPDY session, even though we still have the HTTP connection. Change this so we keep using HTTP until the SPDY session on the Alternate-Protocol becomes available, then we switch over to it.
BUG=69688,75000
TEST=Browse to belshe.com. Examine net-internals to make sure it works. Test over a variety of connections (direct / various proxy types).
Review URL: http://codereview.chromium.org/6610034
TBR=willchan@chromium.org
Review URL: http://codereview.chromium.org/6621040
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@77117 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/url_request')
| -rw-r--r-- | net/url_request/url_request.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/net/url_request/url_request.h b/net/url_request/url_request.h index b8ff569..849a03b 100644 --- a/net/url_request/url_request.h +++ b/net/url_request/url_request.h @@ -405,6 +405,12 @@ class URLRequest : public base::NonThreadSafe { return response_info_.was_npn_negotiated; } + // Returns true if the URLRequest was delivered when the alternate protocol + // is available. + bool was_alternate_protocol_available() const { + return response_info_.was_alternate_protocol_available; + } + // Returns true if the URLRequest was delivered through a proxy. bool was_fetched_via_proxy() const { return response_info_.was_fetched_via_proxy; |