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

Unified Diff: net/quic/spdy_utils.cc

Issue 1976473003: Fixes header translation between SpdyHeaderBlock and other data structures. Not protected. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@121370394
Patch Set: Created 4 years, 7 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 | « no previous file | net/quic/spdy_utils_test.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/quic/spdy_utils.cc
diff --git a/net/quic/spdy_utils.cc b/net/quic/spdy_utils.cc
index bdb4a752ebdce67ec352a484644dbaa40de8a150..78f6e0b9b764091385f7869321bbbbb30e435f7c 100644
--- a/net/quic/spdy_utils.cc
+++ b/net/quic/spdy_utils.cc
@@ -11,6 +11,7 @@
#include "base/strings/string_number_conversions.h"
#include "base/strings/string_split.h"
#include "base/strings/string_util.h"
+#include "base/strings/stringprintf.h"
#include "net/spdy/spdy_frame_builder.h"
#include "net/spdy/spdy_framer.h"
#include "net/spdy/spdy_protocol.h"
@@ -125,12 +126,15 @@ bool SpdyUtils::CopyAndValidateHeaders(const QuicHeaderList& header_list,
return false;
}
- if (headers->find(name) != headers->end()) {
- DLOG(ERROR) << "Duplicate header '" << name << "' found.";
- return false;
+ auto iter = headers->find(name);
+ if (iter == headers->end()) {
+ (*headers)[name] = p.second;
+ } else {
+ // This header had multiple values, so it must be reconstructed.
+ string value = base::StringPrintf(
+ "%s%c%s", iter->second.as_string().c_str(), '\0', p.second.c_str());
+ headers->ReplaceOrAppendHeader(name, value);
}
-
- (*headers)[name] = p.second;
}
if (ContainsKey(*headers, "content-length")) {
« no previous file with comments | « no previous file | net/quic/spdy_utils_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698