summaryrefslogtreecommitdiffstats
path: root/net/spdy/spdy_test_util.cc
diff options
context:
space:
mode:
authormbelshe@chromium.org <mbelshe@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-12-08 18:05:57 +0000
committermbelshe@chromium.org <mbelshe@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-12-08 18:05:57 +0000
commita7a265efd24072f9dc7b5f737ec84d5ae0553cd6 (patch)
tree62180201efd7568a6db59bc3b8c06caa260625d7 /net/spdy/spdy_test_util.cc
parentc1784804a5634728d147baea37257a06ab5cc031 (diff)
downloadchromium_src-a7a265efd24072f9dc7b5f737ec84d5ae0553cd6.zip
chromium_src-a7a265efd24072f9dc7b5f737ec84d5ae0553cd6.tar.gz
chromium_src-a7a265efd24072f9dc7b5f737ec84d5ae0553cd6.tar.bz2
Add origin checking for server pushed resources.
BUG=64108 TEST=PushedStream, ServerPushCrossOriginCorrectness Review URL: http://codereview.chromium.org/5516012 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@68605 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/spdy/spdy_test_util.cc')
-rw-r--r--net/spdy/spdy_test_util.cc8
1 files changed, 5 insertions, 3 deletions
diff --git a/net/spdy/spdy_test_util.cc b/net/spdy/spdy_test_util.cc
index 5d6c9b0..3a7f771 100644
--- a/net/spdy/spdy_test_util.cc
+++ b/net/spdy/spdy_test_util.cc
@@ -334,7 +334,11 @@ spdy::SpdyFrame* ConstructSpdyGet(const char* const url,
// This is so ugly. Why are we using char* in here again?
std::string str_path = gurl.PathForRequest();
std::string str_scheme = gurl.scheme();
- std::string str_host = gurl.host(); // TODO(mbelshe): should have a port.
+ std::string str_host = gurl.host();
+ if (gurl.has_port()) {
+ str_host += ":";
+ str_host += gurl.port();
+ }
scoped_array<char> req(new char[str_path.size() + 1]);
scoped_array<char> scheme(new char[str_scheme.size() + 1]);
scoped_array<char> host(new char[str_host.size() + 1]);
@@ -618,8 +622,6 @@ spdy::SpdyFrame* ConstructSpdyGetSynReply(const char* const extra_headers[],
"bye",
"status",
"200",
- "url",
- "/index.php",
"version",
"HTTP/1.1"
};