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

Unified Diff: net/http/http_basic_stream.cc

Issue 1884943003: HttpStreamParser: Don't reuse sockets which receive unparsed data. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix drainer test ('True' means closed...) Created 4 years, 8 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
Index: net/http/http_basic_stream.cc
diff --git a/net/http/http_basic_stream.cc b/net/http/http_basic_stream.cc
index 0dd7a9e1dcdd4d020451eab45e2faed6a0ccdbde..c6e0573d8d3601bae6642722820504deecbf9ca4 100644
--- a/net/http/http_basic_stream.cc
+++ b/net/http/http_basic_stream.cc
@@ -7,6 +7,7 @@
#include "base/memory/scoped_ptr.h"
#include "net/http/http_request_info.h"
#include "net/http/http_response_body_drainer.h"
+#include "net/http/http_response_info.h"
#include "net/http/http_stream_parser.h"
#include "net/socket/client_socket_handle.h"
@@ -116,8 +117,10 @@ Error HttpBasicStream::GetSignedEKMForTokenBinding(crypto::ECPrivateKey* key,
return parser()->GetSignedEKMForTokenBinding(key, out);
}
-void HttpBasicStream::Drain(HttpNetworkSession* session) {
- HttpResponseBodyDrainer* drainer = new HttpResponseBodyDrainer(this);
+void HttpBasicStream::Drain(HttpNetworkSession* session,
+ scoped_ptr<HttpResponseInfo> response_info) {
+ HttpResponseBodyDrainer* drainer =
+ new HttpResponseBodyDrainer(this, std::move(response_info));
asanka 2016/05/13 15:19:52 The ownership semantics of the Drain() method are
mmenke 2016/05/20 21:50:02 On one hand, you're right about these ownership se
drainer->Start(session);
// |drainer| will delete itself.
}

Powered by Google App Engine
This is Rietveld 408576698