net/http/disk_cache_based_quic_server_info.cc - Issue 192583004: QUIC - use QuicSessionKey tuple (host, port, is_https) instead of server_hostname

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: net/http/disk_cache_based_quic_server_info.cc

Issue 192583004: QUIC - use QuicSessionKey tuple (host, port, is_https) instead of server_hostname (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: use : instead of / as host, port separator Created 6 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

« no previous file with comments | « net/http/disk_cache_based_quic_server_info.h ('k') | net/http/disk_cache_based_quic_server_info_unittest.cc » ('j') | net/tools/quic/quic_client_session.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: net/http/disk_cache_based_quic_server_info.cc

diff --git a/net/http/disk_cache_based_quic_server_info.cc b/net/http/disk_cache_based_quic_server_info.cc

index 91625bc973cec0eee0174c9348fd858d127212f2..2e450e32ad74239dab4d8298aa4254a964fc3ff1 100644

--- a/net/http/disk_cache_based_quic_server_info.cc

+++ b/net/http/disk_cache_based_quic_server_info.cc

@@ -7,6 +7,7 @@

#include "base/bind.h"

#include "base/callback.h"

#include "base/logging.h"

+#include "base/strings/string_number_conversions.h"

#include "net/base/completion_callback.h"

#include "net/base/io_buffer.h"

#include "net/base/net_errors.h"

@@ -44,8 +45,9 @@ struct DiskCacheBasedQuicServerInfo::CacheOperationDataShim {

DiskCacheBasedQuicServerInfo::DiskCacheBasedQuicServerInfo(

const std::string& hostname,

+ uint16 port,

HttpCache* http_cache)

- : QuicServerInfo(hostname),

+ : QuicServerInfo(hostname, port),

weak_factory_(this),

data_shim_(new CacheOperationDataShim()),

io_callback_(

@@ -56,6 +58,7 @@ DiskCacheBasedQuicServerInfo::DiskCacheBasedQuicServerInfo(

ready_(false),

found_entry_(false),

hostname_(hostname),

+ port_(port),

http_cache_(http_cache),

backend_(NULL),

entry_(NULL) {

@@ -113,7 +116,7 @@ DiskCacheBasedQuicServerInfo::~DiskCacheBasedQuicServerInfo() {

}

std::string DiskCacheBasedQuicServerInfo::key() const {

- return "quicserverinfo:" + hostname_;

+ return "quicserverinfo:" + hostname_ + ":" + base::UintToString(port_);

}

void DiskCacheBasedQuicServerInfo::OnIOComplete(CacheOperationDataShim* unused,