summaryrefslogtreecommitdiffstats
path: root/net/spdy
diff options
context:
space:
mode:
authorvandebo@chromium.org <vandebo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-14 16:38:58 +0000
committervandebo@chromium.org <vandebo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-14 16:38:58 +0000
commit697ef4c118a291ca473a3defdb66b55b2e0f30c8 (patch)
treef4e3b927a401885de0366c938a46c835a8716e0e /net/spdy
parent7a4cdac40d2cd8be44ea842a5240ffbb6665eadd (diff)
downloadchromium_src-697ef4c118a291ca473a3defdb66b55b2e0f30c8.zip
chromium_src-697ef4c118a291ca473a3defdb66b55b2e0f30c8.tar.gz
chromium_src-697ef4c118a291ca473a3defdb66b55b2e0f30c8.tar.bz2
Add a RenewStreamForAuth method to HttpStream, replacing DetachConnection
BUG=58192 TEST=Start chrome with --auth-schemes=NTLM and --proxy-server pointing to a Microsoft Forefront Threat Management Gateway proxy configurated for Integrated Authentication. Assuming the user is part of the same domain as the proxy, authentication should work transparently, and the user should not be presented with auth prompts. Also, net_unittests should pass. Review URL: http://codereview.chromium.org/3676004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@62564 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/spdy')
-rw-r--r--net/spdy/spdy_http_stream.cc8
-rw-r--r--net/spdy/spdy_http_stream.h4
2 files changed, 2 insertions, 10 deletions
diff --git a/net/spdy/spdy_http_stream.cc b/net/spdy/spdy_http_stream.cc
index aa86604..0e3962e 100644
--- a/net/spdy/spdy_http_stream.cc
+++ b/net/spdy/spdy_http_stream.cc
@@ -381,12 +381,4 @@ void SpdyHttpStream::GetSSLCertRequestInfo(
stream_->GetSSLCertRequestInfo(cert_request_info);
}
-ClientSocketHandle* SpdyHttpStream::DetachConnection() {
- // DetachConnection is currently used to ensure that multi-round HTTP
- // authentication takes place on the same connection. Since SpdyHttpStream's
- // for the same domain will always map to the same SpdySession, NULL can
- // be returned.
- return NULL;
-}
-
} // namespace net
diff --git a/net/spdy/spdy_http_stream.h b/net/spdy/spdy_http_stream.h
index a8e1a2c..372db57 100644
--- a/net/spdy/spdy_http_stream.h
+++ b/net/spdy/spdy_http_stream.h
@@ -70,6 +70,8 @@ class SpdyHttpStream : public SpdyStream::Delegate, public HttpStream {
// Closes the stream.
virtual void Close(bool not_reusable);
+ virtual HttpStream* RenewStreamForAuth() { return NULL; }
+
// Indicates if the response body has been completely read.
virtual bool IsResponseBodyComplete() const {
if (!stream_)
@@ -91,8 +93,6 @@ class SpdyHttpStream : public SpdyStream::Delegate, public HttpStream {
// SPDY doesn't need an indicator here.
}
- virtual ClientSocketHandle* DetachConnection();
-
virtual void GetSSLInfo(SSLInfo* ssl_info);
virtual void GetSSLCertRequestInfo(SSLCertRequestInfo* cert_request_info);