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

Unified Diff: net/tools/quic/quic_spdy_server_stream.cc

Issue 1036643003: Change the QuicInMemoryCache to store a SpdyHeaderBlock instead of BalsaHeaders. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 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
Index: net/tools/quic/quic_spdy_server_stream.cc
diff --git a/net/tools/quic/quic_spdy_server_stream.cc b/net/tools/quic/quic_spdy_server_stream.cc
index 5937d6d6253a50e3024fb81d20e5f3fa1f06309e..9e07a788f694659e1bb0a2081cce3122e4d70f51 100644
--- a/net/tools/quic/quic_spdy_server_stream.cc
+++ b/net/tools/quic/quic_spdy_server_stream.cc
@@ -4,7 +4,6 @@
#include "net/tools/quic/quic_spdy_server_stream.h"
-#include "base/memory/singleton.h"
#include "net/quic/quic_session.h"
#include "net/spdy/spdy_framer.h"
#include "net/tools/quic/quic_in_memory_cache.h"
@@ -122,25 +121,22 @@ void QuicSpdyServerStream::SendResponse() {
void QuicSpdyServerStream::SendErrorResponse() {
DVLOG(1) << "Sending error response for stream " << id();
- BalsaHeaders headers;
- headers.SetResponseFirstlineFromStringPieces(
- "HTTP/1.1", "500", "Server Error");
- headers.ReplaceOrAppendHeader("content-length", "3");
+ SpdyHeaderBlock headers;
+ headers[":version"] = "HTTP/1.1";
+ headers[":status"] = "500 Server Error";
+ headers["content-length"] = "3";
SendHeadersAndBody(headers, "bad");
}
void QuicSpdyServerStream::SendHeadersAndBody(
- const BalsaHeaders& response_headers,
+ const SpdyHeaderBlock& response_headers,
StringPiece body) {
// We only support SPDY and HTTP, and neither handles bidirectional streaming.
if (!read_side_closed()) {
CloseReadSide();
}
- SpdyHeaderBlock header_block =
- SpdyUtils::ResponseHeadersToSpdyHeaders(response_headers);
-
- WriteHeaders(header_block, body.empty(), nullptr);
+ WriteHeaders(response_headers, body.empty(), nullptr);
if (!body.empty()) {
WriteOrBufferData(body, true, nullptr);

Powered by Google App Engine
This is Rietveld 408576698