diff options
| author | Andras Becsi <andras.becsi@digia.com> | 2014-03-18 13:16:26 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-03-20 15:55:39 +0100 |
| commit | 3f0f86b0caed75241fa71c95a5d73bc0164348c5 (patch) | |
| tree | 92b9fb00f2e9e90b0be2262093876d4f43b6cd13 /chromium/net/tools/quic/spdy_utils.cc | |
| parent | e90d7c4b152c56919d963987e2503f9909a666d2 (diff) | |
| download | qtwebengine-chromium-3f0f86b0caed75241fa71c95a5d73bc0164348c5.tar.gz | |
Update to new stable branch 1750
This also includes an updated ninja and chromium dependencies
needed on Windows.
Change-Id: Icd597d80ed3fa4425933c9f1334c3c2e31291c42
Reviewed-by: Zoltan Arvai <zarvai@inf.u-szeged.hu>
Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
Diffstat (limited to 'chromium/net/tools/quic/spdy_utils.cc')
| -rw-r--r-- | chromium/net/tools/quic/spdy_utils.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chromium/net/tools/quic/spdy_utils.cc b/chromium/net/tools/quic/spdy_utils.cc index 13d05e5e706..c350a96f9e2 100644 --- a/chromium/net/tools/quic/spdy_utils.cc +++ b/chromium/net/tools/quic/spdy_utils.cc @@ -13,7 +13,7 @@ #include "net/spdy/spdy_frame_builder.h" #include "net/spdy/spdy_framer.h" #include "net/spdy/spdy_protocol.h" -#include "net/tools/flip_server/balsa_headers.h" +#include "net/tools/balsa/balsa_headers.h" #include "url/gurl.h" using base::StringPiece; @@ -250,10 +250,10 @@ bool SpdyUtils::FillBalsaResponseHeaders( return false; } - request_headers->SetRequestVersion(version_it->second); if (!ParseReasonAndStatus(status_it->second, request_headers)) { return false; } + request_headers->SetResponseVersion(version_it->second); for (BlockIt it = header_block.begin(); it != header_block.end(); ++it) { if (!IsSpecialSpdyHeader(it, request_headers)) { request_headers->AppendHeader(it->first, it->second); |