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

Unified Diff: net/spdy/spdy_session.cc

Issue 202403002: Land recent SPDY changes (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Sync and rebase. Back out commits included for trybot benefit, but separately landed upstream. Created 6 years, 9 months 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/spdy/spdy_protocol.cc ('k') | net/spdy/spdy_test_utils.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/spdy/spdy_session.cc
diff --git a/net/spdy/spdy_session.cc b/net/spdy/spdy_session.cc
index 5f0e285afc135ad7577ced68f6d2317b75c5d2e1..ef9dec14082631032d67e0286512d33b9d52b2ea 100644
--- a/net/spdy/spdy_session.cc
+++ b/net/spdy/spdy_session.cc
@@ -1912,6 +1912,13 @@ void SpdySession::OnStreamFrameData(SpdyStreamId stream_id,
if (availability_state_ == STATE_CLOSED)
return;
+ if (data == NULL && len != 0) {
+ // This is notification of consumed data padding.
+ // TODO(jgraettinger): Properly flow padding into WINDOW_UPDATE frames.
+ // See crbug.com/353012.
+ return;
+ }
+
DCHECK_LT(len, 1u << 24);
if (net_log().IsLogging()) {
net_log().AddEvent(
« no previous file with comments | « net/spdy/spdy_protocol.cc ('k') | net/spdy/spdy_test_utils.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698