summaryrefslogtreecommitdiffstats
path: root/net/spdy/spdy_stream.h
diff options
context:
space:
mode:
authorcbentzel@chromium.org <cbentzel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-05-10 16:48:04 +0000
committercbentzel@chromium.org <cbentzel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-05-10 16:48:04 +0000
commit3264fc3cf0162e1d2302b31afc55c8c3d7aef71d (patch)
treeff04ab8ef005d2e160c47d5fc67a6cda12c684b1 /net/spdy/spdy_stream.h
parent85632fab9c8f30b4651f06fd75e1ba5881226e6c (diff)
downloadchromium_src-3264fc3cf0162e1d2302b31afc55c8c3d7aef71d.zip
chromium_src-3264fc3cf0162e1d2302b31afc55c8c3d7aef71d.tar.gz
chromium_src-3264fc3cf0162e1d2302b31afc55c8c3d7aef71d.tar.bz2
Fix valgrind memcheck issues with GetPushStream unit test.
BUG=None TEST=valgrind --leak-check=yes net_unittests --gtest_filter="*SpdySessionTest.GetPushStream*" Review URL: http://codereview.chromium.org/1951001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@46823 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/spdy/spdy_stream.h')
-rw-r--r--net/spdy/spdy_stream.h15
1 files changed, 12 insertions, 3 deletions
diff --git a/net/spdy/spdy_stream.h b/net/spdy/spdy_stream.h
index 235e645..37f6900bf 100644
--- a/net/spdy/spdy_stream.h
+++ b/net/spdy/spdy_stream.h
@@ -127,9 +127,7 @@ class SpdyStream : public base::RefCounted<SpdyStream> {
bool cancelled() const { return cancelled_; }
- void set_response_info_pointer(HttpResponseInfo* response_info) {
- response_ = response_info;
- }
+ void SetPushResponse(HttpResponseInfo* response_info);
private:
friend class base::RefCounted<SpdyStream>;
@@ -192,7 +190,18 @@ class SpdyStream : public base::RefCounted<SpdyStream> {
// For cached responses, this time could be "far" in the past.
base::Time request_time_;
+ // The push_response_ is the HTTP response data which is part of
+ // a server-initiated SYN_STREAM. If a client request comes in
+ // which matches the push stream, the data in push_response_ will
+ // be copied over to the response_ object owned by the caller
+ // of the request.
+ scoped_ptr<HttpResponseInfo> push_response_;
+
+ // response_ is the HTTP response data object which is filled in
+ // when a SYN_REPLY comes in for the stream. It is not owned by this
+ // stream object.
HttpResponseInfo* response_;
+
scoped_ptr<UploadDataStream> request_body_stream_;
bool response_complete_; // TODO(mbelshe): fold this into the io_state.