Re-land: Only allow HTTP/0.9 support on default ports.

net/http/http_basic_state.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "net/http/http_basic_state.h"
 
 #include <utility>
 
 #include "base/logging.h"
 #include "net/base/io_buffer.h"
 #include "net/http/http_request_info.h"
 #include "net/http/http_response_body_drainer.h"
 #include "net/http/http_stream_parser.h"
 #include "net/http/http_util.h"
 #include "net/socket/client_socket_handle.h"
 #include "url/gurl.h"
 
 namespace net {
 
 HttpBasicState::HttpBasicState(std::unique_ptr<ClientSocketHandle> connection,
-                               bool using_proxy)
+                               bool using_proxy,
+                               bool http_09_on_non_default_ports_enabled)
     : read_buf_(new GrowableIOBuffer()),
       connection_(std::move(connection)),
       using_proxy_(using_proxy),
-      request_info_(NULL) {}
+      http_09_on_non_default_ports_enabled_(
+          http_09_on_non_default_ports_enabled),
+      request_info_(nullptr) {}
 
 HttpBasicState::~HttpBasicState() {}
 
 int HttpBasicState::Initialize(const HttpRequestInfo* request_info,
                                RequestPriority priority,
                                const BoundNetLog& net_log,
                                const CompletionCallback& callback) {
   DCHECK(!parser_.get());
   request_info_ = request_info;
   parser_.reset(new HttpStreamParser(
       connection_.get(), request_info, read_buf_.get(), net_log));
+  parser_->set_http_09_on_non_default_ports_enabled(
+      http_09_on_non_default_ports_enabled_);
   return OK;
 }
 
 std::unique_ptr<ClientSocketHandle> HttpBasicState::ReleaseConnection() {
   return std::move(connection_);
 }
 
 scoped_refptr<GrowableIOBuffer> HttpBasicState::read_buf() const {
   return read_buf_;
 }
@@ skipping 14 matching lines @@
   request_line.reserve(expected_size);
   request_line.append(request_info_->method);
   request_line.append(1, ' ');
   request_line.append(path);
   request_line.append(kSuffix, kSuffixLen);
   DCHECK_EQ(expected_size, request_line.size());
   return request_line;
 }
 
 }  // namespace net