Update Envoy (#2105)

* Leap to today's Envoy version
* Fixup GoogleUrl::CopyAndAddEscapedQueryParam

Signed-off-by: Otto van der Schaaf <[email protected]>

Author: oschaaf

.bazelrc

@@ -45,6 +45,10 @@ build:linux --features=per_object_debug_info
 build:linux --action_env=BAZEL_LINKLIBS=-l%:libstdc++.a
 build:linux --action_env=BAZEL_LINKOPTS=-lm
 
+# TODO(keith): remove once https://github.com/DataDog/dd-opentracing-cpp/pull/252 is integrated
+# this avoids warnings/errors on arm64 Linux builds
+build:linux --per_file_copt=external/com_github_datadog_dd_opentracing_cpp/.*.cpp@-Wno-type-limits
+
 # We already have absl in the build, define absl=1 to tell googletest to use absl for backtrace.
 build --define absl=1
 
@@ -373,6 +377,7 @@ build:windows --define tcmalloc=disabled
 build:windows --define wasm=disabled
 build:windows --define manual_stamp=manual_stamp
 build:windows --cxxopt="/std:c++17"
+build:windows --output_groups=+pdb_file
 
 # TODO(wrowe,sunjayBhatia): Resolve bugs upstream in curl and rules_foreign_cc
 # See issue https://github.com/bazelbuild/rules_foreign_cc/issues/301
@@ -418,4 +423,4 @@ try-import %workspace%/user.bazelrc
 try-import %workspace%/local_tsan.bazelrc
 
 ###### modifications for pagespeed
-try-import %workspace%/pagespeed.bazelrc
+import %workspace%/pagespeed.bazelrc

.bazelversion

@@ -1 +1 @@
-6.0.0-pre.20220706.4
+6.0.0rc1

bazel/repositories.bzl

@@ -13,8 +13,8 @@ load(":aprutil.bzl", "aprutil_build_rule")
 load(":serf.bzl", "serf_build_rule")
 load(":closure_compiler.bzl", "closure_library_rules")
 
-ENVOY_COMMIT = "ff49762696b2e6ed3f408a22e1f7a1b7d2487318"  # Oct 11th, 2022
-ENVOY_SHA = "ff8303892364ec1be7e5be13e112bc45309aee2bc4da5c4ff035885367f24795"
+ENVOY_COMMIT = "9ae348cc43e0341ec7eadd6a4addce587afe1b27"  # Nov 5th, 2022
+ENVOY_SHA = "f7215f2e2014c2d4123c5f7a2ba7054fdd33d8fa4ad2977c5bf45d9e231dea6d"
 
 BROTLI_COMMIT = "d6d98957ca8ccb1ef45922e978bb10efca0ea541"
 BROTLI_SHA = "ba8be5d701b369f86d14f3701c81d6bf6c6c34015c183ff98352c12ea5f5226b"

pagespeed/kernel/http/google_url.cc

@@ -153,10 +153,8 @@ GoogleUrl* GoogleUrl::CopyAndAddEscapedQueryParam(
   query_params.ParseFromUrl(*this);
   query_params.AddEscaped(escaped_name, escaped_value);
   GoogleString query_params_string = query_params.ToEscapedString();
-  url::Replacements<char> replace_query;
-  url::Component query;
-  query.len = query_params_string.size();
-  replace_query.SetQuery(query_params_string.c_str(), query);
+  GURL::Replacements replace_query;
+  replace_query.SetQueryStr(query_params_string.c_str());
   GoogleUrl* result = new GoogleUrl(gurl_->ReplaceComponents(replace_query));
   return result;
 }