HttpServerProperties: Add NetworkIsolationKey to RequiresHTTP11 methods.
This CL adds NetworkIsolationKey as an argument to the
RequiresHTTP11 methods in HttpServerProperties, and makes consumers
pass in the correct key. It also moves tracking of this bit over to the
ServerInfo struct, to simplify things a bit, which requires the
RequiresHTTP11 take a SchemeHostPort instead of a HostPortPair.
Bug: 969890
Change-Id: Ieb7a8ae234eae2d459895b63101be4d1c00d82fe
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1761553
Reviewed-by: Zhongyi Shi <[email protected]>
Commit-Queue: Matt Menke <[email protected]>
Cr-Commit-Position: refs/heads/master@{#691444}
diff --git a/net/http/http_network_transaction.cc b/net/http/http_network_transaction.cc
index c9d296a0..149fdf6 100644
--- a/net/http/http_network_transaction.cc
+++ b/net/http/http_network_transaction.cc
@@ -66,6 +66,7 @@
#include "net/ssl/ssl_info.h"
#include "net/ssl/ssl_private_key.h"
#include "url/gurl.h"
+#include "url/scheme_host_port.h"
#include "url/url_canon.h"
#if BUILDFLAG(ENABLE_REPORTING)
@@ -324,7 +325,8 @@
if (target == HttpAuth::AUTH_SERVER &&
auth_controllers_[target]->NeedsHTTP11()) {
session_->http_server_properties()->SetHTTP11Required(
- HostPortPair::FromURL(request_->url));
+ HttpServerProperties::GetNormalizedSchemeHostPort(request_->url),
+ request_->network_isolation_key);
}
bool keep_alive = false;
