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-07-30 02:35:35 +0000
committermbelshe@chromium.org <mbelshe@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-07-30 02:35:35 +0000
commit6380788c0656de45dbec7589148a69dd4f996bb9 (patch)
tree02371488c9633e5920c7ac605a781809bd772625 /net/spdy/spdy_test_util.cc
parent8db2b8493a35e2318bd47a6be52df88079d0a976 (diff)
downloadchromium_src-6380788c0656de45dbec7589148a69dd4f996bb9.zip
chromium_src-6380788c0656de45dbec7589148a69dd4f996bb9.tar.gz
chromium_src-6380788c0656de45dbec7589148a69dd4f996bb9.tar.bz2
Use relative instead of absolute URIs in SPDY requests
BUG=50549 TEST=existing Review URL: http://codereview.chromium.org/3035037 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@54260 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/spdy/spdy_test_util.cc')
-rw-r--r--net/spdy/spdy_test_util.cc35
1 files changed, 32 insertions, 3 deletions
diff --git a/net/spdy/spdy_test_util.cc b/net/spdy/spdy_test_util.cc
index 291f2cd..97c87c0 100644
--- a/net/spdy/spdy_test_util.cc
+++ b/net/spdy/spdy_test_util.cc
@@ -269,11 +269,32 @@ spdy::SpdyFrame* ConstructSpdyGet(const char* const url,
0, // Length
spdy::DATA_FLAG_NONE // Data Flags
};
+
+ GURL gurl(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.
+ scoped_ptr<char> req(new char[str_path.size() + 1]);
+ scoped_ptr<char> scheme(new char[str_scheme.size() + 1]);
+ scoped_ptr<char> host(new char[str_host.size() + 1]);
+ memcpy(req.get(), str_path.c_str(), str_path.size());
+ memcpy(scheme.get(), str_scheme.c_str(), str_scheme.size());
+ memcpy(host.get(), str_host.c_str(), str_host.size());
+ req.get()[str_path.size()] = '\0';
+ scheme.get()[str_scheme.size()] = '\0';
+ host.get()[str_host.size()] = '\0';
+
const char* const headers[] = {
"method",
"GET",
"url",
- url,
+ req.get(),
+ "host",
+ host.get(),
+ "scheme",
+ scheme.get(),
"version",
"HTTP/1.1"
};
@@ -310,7 +331,11 @@ spdy::SpdyFrame* ConstructSpdyGet(const char* const extra_headers[],
"method",
"GET",
"url",
- "http://www.google.com/",
+ "/",
+ "host",
+ "www.google.com",
+ "scheme",
+ "http",
"version",
"HTTP/1.1"
};
@@ -381,7 +406,11 @@ spdy::SpdyFrame* ConstructSpdyPost(const char* const extra_headers[],
"method",
"POST",
"url",
- "http://www.google.com/",
+ "/",
+ "host",
+ "www.google.com",
+ "scheme",
+ "http",
"version",
"HTTP/1.1"
};