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

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

Issue 1570343005: relnote: Implement server push methods in QuicSimpleServerSession. Only modify toy Quic server, not… (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@0044_CL_111708360
Patch Set: rebase to chain after fix Created 4 years, 11 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/tools/quic/quic_simple_server_session_test.cc ('k') | net/tools/quic/quic_simple_server_stream_test.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/tools/quic/quic_simple_server_stream.cc
diff --git a/net/tools/quic/quic_simple_server_stream.cc b/net/tools/quic/quic_simple_server_stream.cc
index 3a85d84b79f9fea8fd46e3a2fc4328138653b78f..6f056b5e013f0c33b09486216318f9c099b3aad0 100644
--- a/net/tools/quic/quic_simple_server_stream.cc
+++ b/net/tools/quic/quic_simple_server_stream.cc
@@ -10,11 +10,11 @@
#include "base/strings/string_piece.h"
#include "base/strings/string_split.h"
#include "net/quic/quic_flags.h"
-#include "net/quic/quic_spdy_session.h"
#include "net/quic/quic_spdy_stream.h"
#include "net/quic/spdy_utils.h"
#include "net/spdy/spdy_protocol.h"
#include "net/tools/quic/quic_in_memory_cache.h"
+#include "net/tools/quic/quic_simple_server_session.h"
using base::StringPiece;
using base::StringToInt;
@@ -143,9 +143,15 @@ void QuicSimpleServerStream::SendResponse() {
// Examing response status, if it was not pure integer as typical h2 response
// status, send error response.
- string request_url = request_headers_[":scheme"].as_string() + "://" +
- request_headers_[":authority"].as_string() +
- request_headers_[":path"].as_string();
+ string request_url;
+ if (!request_headers_[":scheme"].as_string().empty()) {
+ request_url = request_headers_[":scheme"].as_string() +"://" +
+ request_headers_[":authority"].as_string() +
+ request_headers_[":path"].as_string();
+ } else {
+ request_url = request_headers_[":authority"].as_string() +
+ request_headers_[":path"].as_string();
+ }
int response_code;
SpdyHeaderBlock response_headers = response->headers();
if (!base::StringToInt(response_headers[":status"], &response_code)) {
@@ -168,6 +174,18 @@ void QuicSimpleServerStream::SendResponse() {
return;
}
}
+ list<QuicInMemoryCache::ServerPushInfo> resources =
+ QuicInMemoryCache::GetInstance()->GetServerPushResources(request_url);
+ DVLOG(1) << "Found " << resources.size() << " push resources for stream "
+ << id();
+
+ if (!resources.empty()) {
+ QuicSimpleServerSession* session =
+ static_cast<QuicSimpleServerSession*>(spdy_session());
+ session->PromisePushResources(request_url, resources, id(),
+ request_headers_);
+ }
+
DVLOG(1) << "Sending response for stream " << id();
SendHeadersAndBodyAndTrailers(response->headers(), response->body(),
response->trailers());
« no previous file with comments | « net/tools/quic/quic_simple_server_session_test.cc ('k') | net/tools/quic/quic_simple_server_stream_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698