Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(150)

Unified Diff: net/spdy/spdy_session.cc

Issue 5409004: Fix case where a SPDY stream with an un-verified cert would kill the browser... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 10 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « net/http/http_stream_request.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/spdy/spdy_session.cc
===================================================================
--- net/spdy/spdy_session.cc (revision 67728)
+++ net/spdy/spdy_session.cc (working copy)
@@ -314,9 +314,10 @@
// encrypted SSL socket.
if (is_secure_ && certificate_error_code_ != OK &&
(url.SchemeIs("https") || url.SchemeIs("wss"))) {
- LOG(DFATAL) << "Tried to get pushed spdy stream for secure content over an "
- << "unauthenticated session.";
- return certificate_error_code_;
+ LOG(ERROR) << "Tried to get pushed spdy stream for secure content over an "
willchan no longer on Chromium 2010/12/02 23:02:45 Why is this ERROR instead of DFATAL? It's a bug i
+ << "unauthenticated session.";
+ CloseSessionOnError(static_cast<net::Error>(certificate_error_code_), true);
+ return ERR_SPDY_PROTOCOL_ERROR;
}
const std::string& path = url.PathForRequest();
@@ -411,9 +412,10 @@
// encrypted SSL socket.
if (is_secure_ && certificate_error_code_ != OK &&
(url.SchemeIs("https") || url.SchemeIs("wss"))) {
- LOG(DFATAL) << "Tried to create spdy stream for secure content over an "
- << "unauthenticated session.";
- return certificate_error_code_;
+ LOG(ERROR) << "Tried to create spdy stream for secure content over an "
+ << "unauthenticated session.";
+ CloseSessionOnError(static_cast<net::Error>(certificate_error_code_), true);
+ return ERR_SPDY_PROTOCOL_ERROR;
}
const std::string& path = url.PathForRequest();
« no previous file with comments | « net/http/http_stream_request.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698