| 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);
|
|
|