Adding upstream version 1.62.1.upstream/1.62.1upstream

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 91 insertions, 117 deletions

diff --git a/src/shrpx_worker_test.cc b/src/shrpx_worker_test.cc
index 4b4b7a6..9372a2c 100644
--- a/src/shrpx_worker_test.cc
+++ b/src/shrpx_worker_test.cc
@@ -74,154 +74,134 @@ void test_shrpx_worker_match_downstream_addr_group(void) {
   }
 
   assert_size(0, ==,
-              match_downstream_addr_group(
-                  routerconf, StringRef::from_lit("nghttp2.org"),
-                  StringRef::from_lit("/"), groups, 255, balloc));
+              match_downstream_addr_group(routerconf, "nghttp2.org"_sr, "/"_sr,
+                                          groups, 255, balloc));
 
   // port is removed
   assert_size(0, ==,
-              match_downstream_addr_group(
-                  routerconf, StringRef::from_lit("nghttp2.org:8080"),
-                  StringRef::from_lit("/"), groups, 255, balloc));
+              match_downstream_addr_group(routerconf, "nghttp2.org:8080"_sr,
+                                          "/"_sr, groups, 255, balloc));
 
   // host is case-insensitive
   assert_size(4, ==,
-              match_downstream_addr_group(
-                  routerconf, StringRef::from_lit("WWW.nghttp2.org"),
-                  StringRef::from_lit("/alpha"), groups, 255, balloc));
+              match_downstream_addr_group(routerconf, "WWW.nghttp2.org"_sr,
+                                          "/alpha"_sr, groups, 255, balloc));
 
   assert_size(1, ==,
-              match_downstream_addr_group(
-                  routerconf, StringRef::from_lit("nghttp2.org"),
-                  StringRef::from_lit("/alpha/bravo/"), groups, 255, balloc));
+              match_downstream_addr_group(routerconf, "nghttp2.org"_sr,
+                                          "/alpha/bravo/"_sr, groups, 255,
+                                          balloc));
 
   // /alpha/bravo also matches /alpha/bravo/
   assert_size(1, ==,
-              match_downstream_addr_group(
-                  routerconf, StringRef::from_lit("nghttp2.org"),
-                  StringRef::from_lit("/alpha/bravo"), groups, 255, balloc));
+              match_downstream_addr_group(routerconf, "nghttp2.org"_sr,
+                                          "/alpha/bravo"_sr, groups, 255,
+                                          balloc));
 
   // path part is case-sensitive
   assert_size(0, ==,
-              match_downstream_addr_group(
-                  routerconf, StringRef::from_lit("nghttp2.org"),
-                  StringRef::from_lit("/Alpha/bravo"), groups, 255, balloc));
+              match_downstream_addr_group(routerconf, "nghttp2.org"_sr,
+                                          "/Alpha/bravo"_sr, groups, 255,
+                                          balloc));
 
   assert_size(1, ==,
-              match_downstream_addr_group(
-                  routerconf, StringRef::from_lit("nghttp2.org"),
-                  StringRef::from_lit("/alpha/bravo/charlie"), groups, 255,
-                  balloc));
+              match_downstream_addr_group(routerconf, "nghttp2.org"_sr,
+                                          "/alpha/bravo/charlie"_sr, groups,
+                                          255, balloc));
 
   assert_size(2, ==,
-              match_downstream_addr_group(
-                  routerconf, StringRef::from_lit("nghttp2.org"),
-                  StringRef::from_lit("/alpha/charlie"), groups, 255, balloc));
+              match_downstream_addr_group(routerconf, "nghttp2.org"_sr,
+                                          "/alpha/charlie"_sr, groups, 255,
+                                          balloc));
 
   // pattern which does not end with '/' must match its entirely.  So
   // this matches to group 0, not group 2.
   assert_size(0, ==,
-              match_downstream_addr_group(
-                  routerconf, StringRef::from_lit("nghttp2.org"),
-                  StringRef::from_lit("/alpha/charlie/"), groups, 255, balloc));
+              match_downstream_addr_group(routerconf, "nghttp2.org"_sr,
+                                          "/alpha/charlie/"_sr, groups, 255,
+                                          balloc));
 
   assert_size(255, ==,
-              match_downstream_addr_group(
-                  routerconf, StringRef::from_lit("example.org"),
-                  StringRef::from_lit("/"), groups, 255, balloc));
+              match_downstream_addr_group(routerconf, "example.org"_sr, "/"_sr,
+                                          groups, 255, balloc));
 
   assert_size(255, ==,
-              match_downstream_addr_group(routerconf, StringRef::from_lit(""),
-                                          StringRef::from_lit("/"), groups, 255,
-                                          balloc));
+              match_downstream_addr_group(routerconf, ""_sr, "/"_sr, groups,
+                                          255, balloc));
 
   assert_size(255, ==,
-              match_downstream_addr_group(routerconf, StringRef::from_lit(""),
-                                          StringRef::from_lit("alpha"), groups,
+              match_downstream_addr_group(routerconf, ""_sr, "alpha"_sr, groups,
                                           255, balloc));
 
   assert_size(255, ==,
-              match_downstream_addr_group(
-                  routerconf, StringRef::from_lit("foo/bar"),
-                  StringRef::from_lit("/"), groups, 255, balloc));
+              match_downstream_addr_group(routerconf, "foo/bar"_sr, "/"_sr,
+                                          groups, 255, balloc));
 
-  // If path is StringRef::from_lit("*", only match with host + "/").
+  // If path is "*", only match with host + "/").
   assert_size(0, ==,
-              match_downstream_addr_group(
-                  routerconf, StringRef::from_lit("nghttp2.org"),
-                  StringRef::from_lit("*"), groups, 255, balloc));
+              match_downstream_addr_group(routerconf, "nghttp2.org"_sr, "*"_sr,
+                                          groups, 255, balloc));
 
   assert_size(5, ==,
-              match_downstream_addr_group(
-                  routerconf, StringRef::from_lit("[::1]"),
-                  StringRef::from_lit("/"), groups, 255, balloc));
+              match_downstream_addr_group(routerconf, "[::1]"_sr, "/"_sr,
+                                          groups, 255, balloc));
   assert_size(5, ==,
-              match_downstream_addr_group(
-                  routerconf, StringRef::from_lit("[::1]:8080"),
-                  StringRef::from_lit("/"), groups, 255, balloc));
+              match_downstream_addr_group(routerconf, "[::1]:8080"_sr, "/"_sr,
+                                          groups, 255, balloc));
   assert_size(255, ==,
-              match_downstream_addr_group(
-                  routerconf, StringRef::from_lit("[::1"),
-                  StringRef::from_lit("/"), groups, 255, balloc));
+              match_downstream_addr_group(routerconf, "[::1"_sr, "/"_sr, groups,
+                                          255, balloc));
   assert_size(255, ==,
-              match_downstream_addr_group(
-                  routerconf, StringRef::from_lit("[::1]8000"),
-                  StringRef::from_lit("/"), groups, 255, balloc));
+              match_downstream_addr_group(routerconf, "[::1]8000"_sr, "/"_sr,
+                                          groups, 255, balloc));
 
   // Check the case where adding route extends tree
   assert_size(6, ==,
-              match_downstream_addr_group(
-                  routerconf, StringRef::from_lit("nghttp2.org"),
-                  StringRef::from_lit("/alpha/bravo/delta"), groups, 255,
-                  balloc));
+              match_downstream_addr_group(routerconf, "nghttp2.org"_sr,
+                                          "/alpha/bravo/delta"_sr, groups, 255,
+                                          balloc));
 
   assert_size(1, ==,
-              match_downstream_addr_group(
-                  routerconf, StringRef::from_lit("nghttp2.org"),
-                  StringRef::from_lit("/alpha/bravo/delta/"), groups, 255,
-                  balloc));
+              match_downstream_addr_group(routerconf, "nghttp2.org"_sr,
+                                          "/alpha/bravo/delta/"_sr, groups, 255,
+                                          balloc));
 
   // Check the case where query is done in a single node
   assert_size(7, ==,
-              match_downstream_addr_group(
-                  routerconf, StringRef::from_lit("example.com"),
-                  StringRef::from_lit("/alpha/bravo"), groups, 255, balloc));
+              match_downstream_addr_group(routerconf, "example.com"_sr,
+                                          "/alpha/bravo"_sr, groups, 255,
+                                          balloc));
 
   assert_size(255, ==,
-              match_downstream_addr_group(
-                  routerconf, StringRef::from_lit("example.com"),
-                  StringRef::from_lit("/alpha/bravo/"), groups, 255, balloc));
+              match_downstream_addr_group(routerconf, "example.com"_sr,
+                                          "/alpha/bravo/"_sr, groups, 255,
+                                          balloc));
 
   assert_size(255, ==,
-              match_downstream_addr_group(
-                  routerconf, StringRef::from_lit("example.com"),
-                  StringRef::from_lit("/alpha"), groups, 255, balloc));
+              match_downstream_addr_group(routerconf, "example.com"_sr,
+                                          "/alpha"_sr, groups, 255, balloc));
 
   // Check the case where quey is done in a single node
   assert_size(8, ==,
-              match_downstream_addr_group(
-                  routerconf, StringRef::from_lit("192.168.0.1"),
-                  StringRef::from_lit("/alpha"), groups, 255, balloc));
+              match_downstream_addr_group(routerconf, "192.168.0.1"_sr,
+                                          "/alpha"_sr, groups, 255, balloc));
 
   assert_size(8, ==,
-              match_downstream_addr_group(
-                  routerconf, StringRef::from_lit("192.168.0.1"),
-                  StringRef::from_lit("/alpha/"), groups, 255, balloc));
+              match_downstream_addr_group(routerconf, "192.168.0.1"_sr,
+                                          "/alpha/"_sr, groups, 255, balloc));
 
   assert_size(8, ==,
-              match_downstream_addr_group(
-                  routerconf, StringRef::from_lit("192.168.0.1"),
-                  StringRef::from_lit("/alpha/bravo"), groups, 255, balloc));
+              match_downstream_addr_group(routerconf, "192.168.0.1"_sr,
+                                          "/alpha/bravo"_sr, groups, 255,
+                                          balloc));
 
   assert_size(255, ==,
-              match_downstream_addr_group(
-                  routerconf, StringRef::from_lit("192.168.0.1"),
-                  StringRef::from_lit("/alph"), groups, 255, balloc));
+              match_downstream_addr_group(routerconf, "192.168.0.1"_sr,
+                                          "/alph"_sr, groups, 255, balloc));
 
   assert_size(255, ==,
-              match_downstream_addr_group(
-                  routerconf, StringRef::from_lit("192.168.0.1"),
-                  StringRef::from_lit("/"), groups, 255, balloc));
+              match_downstream_addr_group(routerconf, "192.168.0.1"_sr, "/"_sr,
+                                          groups, 255, balloc));
 
   // Test for wildcard hosts
   auto g1 = std::make_shared<DownstreamAddrGroup>();
@@ -236,52 +216,46 @@ void test_shrpx_worker_match_downstream_addr_group(void) {
   g3->pattern = ImmutableString::from_lit(".local");
   groups.push_back(std::move(g3));
 
-  wp.emplace_back(StringRef::from_lit("git.nghttp2.org"));
-  wcrouter.add_route(StringRef::from_lit("gro.2ptthgn.tig"), 0);
-  wp.back().router.add_route(StringRef::from_lit("/echo/"), 10);
+  wp.emplace_back("git.nghttp2.org"_sr);
+  wcrouter.add_route("gro.2ptthgn.tig"_sr, 0);
+  wp.back().router.add_route("/echo/"_sr, 10);
 
-  wp.emplace_back(StringRef::from_lit(".nghttp2.org"));
-  wcrouter.add_route(StringRef::from_lit("gro.2ptthgn."), 1);
-  wp.back().router.add_route(StringRef::from_lit("/echo/"), 11);
-  wp.back().router.add_route(StringRef::from_lit("/echo/foxtrot"), 12);
+  wp.emplace_back(".nghttp2.org"_sr);
+  wcrouter.add_route("gro.2ptthgn."_sr, 1);
+  wp.back().router.add_route("/echo/"_sr, 11);
+  wp.back().router.add_route("/echo/foxtrot"_sr, 12);
 
-  wp.emplace_back(StringRef::from_lit(".local"));
-  wcrouter.add_route(StringRef::from_lit("lacol."), 2);
-  wp.back().router.add_route(StringRef::from_lit("/"), 13);
+  wp.emplace_back(".local"_sr);
+  wcrouter.add_route("lacol."_sr, 2);
+  wp.back().router.add_route("/"_sr, 13);
 
   assert_size(11, ==,
-              match_downstream_addr_group(
-                  routerconf, StringRef::from_lit("git.nghttp2.org"),
-                  StringRef::from_lit("/echo"), groups, 255, balloc));
+              match_downstream_addr_group(routerconf, "git.nghttp2.org"_sr,
+                                          "/echo"_sr, groups, 255, balloc));
 
   assert_size(10, ==,
-              match_downstream_addr_group(
-                  routerconf, StringRef::from_lit("0git.nghttp2.org"),
-                  StringRef::from_lit("/echo"), groups, 255, balloc));
+              match_downstream_addr_group(routerconf, "0git.nghttp2.org"_sr,
+                                          "/echo"_sr, groups, 255, balloc));
 
   assert_size(11, ==,
-              match_downstream_addr_group(
-                  routerconf, StringRef::from_lit("it.nghttp2.org"),
-                  StringRef::from_lit("/echo"), groups, 255, balloc));
+              match_downstream_addr_group(routerconf, "it.nghttp2.org"_sr,
+                                          "/echo"_sr, groups, 255, balloc));
 
   assert_size(255, ==,
-              match_downstream_addr_group(
-                  routerconf, StringRef::from_lit(".nghttp2.org"),
-                  StringRef::from_lit("/echo/foxtrot"), groups, 255, balloc));
+              match_downstream_addr_group(routerconf, ".nghttp2.org"_sr,
+                                          "/echo/foxtrot"_sr, groups, 255,
+                                          balloc));
 
   assert_size(9, ==,
-              match_downstream_addr_group(
-                  routerconf, StringRef::from_lit("alpha.nghttp2.org"),
-                  StringRef::from_lit("/golf"), groups, 255, balloc));
+              match_downstream_addr_group(routerconf, "alpha.nghttp2.org"_sr,
+                                          "/golf"_sr, groups, 255, balloc));
 
   assert_size(0, ==,
-              match_downstream_addr_group(
-                  routerconf, StringRef::from_lit("nghttp2.org"),
-                  StringRef::from_lit("/echo"), groups, 255, balloc));
+              match_downstream_addr_group(routerconf, "nghttp2.org"_sr,
+                                          "/echo"_sr, groups, 255, balloc));
 
   assert_size(13, ==,
-              match_downstream_addr_group(routerconf,
-                                          StringRef::from_lit("test.local"),
+              match_downstream_addr_group(routerconf, "test.local"_sr,
                                           StringRef{}, groups, 255, balloc));
 }