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

Unified Diff: net/http/http_stream_factory_impl.cc

Issue 275953002: Remove HTTP pipelining support. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge Created 6 years, 7 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_stream_factory_impl.cc
diff --git a/net/http/http_stream_factory_impl.cc b/net/http/http_stream_factory_impl.cc
index 7500373eeb485e82774654ddb4963fa710c54d6f..7cf5e08ced0ca5fd6026424fdb0726c854f70b53 100644
--- a/net/http/http_stream_factory_impl.cc
+++ b/net/http/http_stream_factory_impl.cc
@@ -12,9 +12,6 @@
#include "net/base/net_log.h"
#include "net/base/net_util.h"
#include "net/http/http_network_session.h"
-#include "net/http/http_pipelined_connection.h"
-#include "net/http/http_pipelined_host.h"
-#include "net/http/http_pipelined_stream.h"
#include "net/http/http_server_properties.h"
#include "net/http/http_stream_factory_impl_job.h"
#include "net/http/http_stream_factory_impl_request.h"
@@ -45,15 +42,11 @@ GURL UpgradeUrlToHttps(const GURL& original_url, int port) {
HttpStreamFactoryImpl::HttpStreamFactoryImpl(HttpNetworkSession* session,
bool for_websockets)
: session_(session),
- http_pipelined_host_pool_(this, NULL,
- session_->http_server_properties(),
- session_->force_http_pipelining()),
for_websockets_(for_websockets) {}
HttpStreamFactoryImpl::~HttpStreamFactoryImpl() {
DCHECK(request_map_.empty());
DCHECK(spdy_session_request_map_.empty());
- DCHECK(http_pipelining_request_map_.empty());
std::set<const Job*> tmp_job_set;
tmp_job_set.swap(orphaned_job_set_);
@@ -179,10 +172,6 @@ void HttpStreamFactoryImpl::PreconnectStreams(
job->Preconnect(num_streams);
}
-base::Value* HttpStreamFactoryImpl::PipelineInfoToValue() const {
- return http_pipelined_host_pool_.PipelineInfoToValue();
-}
-
const HostMappingRules* HttpStreamFactoryImpl::GetHostMappingRules() const {
return session_->params().host_mapping_rules;
}
@@ -319,40 +308,4 @@ void HttpStreamFactoryImpl::OnPreconnectsComplete(const Job* job) {
OnPreconnectsCompleteInternal();
}
-void HttpStreamFactoryImpl::OnHttpPipelinedHostHasAdditionalCapacity(
- HttpPipelinedHost* host) {
- while (ContainsKey(http_pipelining_request_map_, host->GetKey())) {
- HttpPipelinedStream* stream =
- http_pipelined_host_pool_.CreateStreamOnExistingPipeline(
- host->GetKey());
- if (!stream) {
- break;
- }
-
- Request* request = *http_pipelining_request_map_[host->GetKey()].begin();
- request->Complete(stream->was_npn_negotiated(),
- stream->protocol_negotiated(),
- false, // not using_spdy
- stream->net_log());
- request->OnStreamReady(NULL,
- stream->used_ssl_config(),
- stream->used_proxy_info(),
- stream);
- }
-}
-
-void HttpStreamFactoryImpl::AbortPipelinedRequestsWithKey(
- const Job* job, const HttpPipelinedHost::Key& key, int status,
- const SSLConfig& used_ssl_config) {
- RequestVector requests_to_fail = http_pipelining_request_map_[key];
- for (RequestVector::const_iterator it = requests_to_fail.begin();
- it != requests_to_fail.end(); ++it) {
- Request* request = *it;
- if (request == request_map_[job]) {
- continue;
- }
- request->OnStreamFailed(NULL, status, used_ssl_config);
- }
-}
-
} // namespace net

Powered by Google App Engine
This is Rietveld 408576698