Merge github.com:grpc/grpc into ctx8

6 months ago · ea7da93756
parent 69844821bb 35a896aaae
commit ea7da93756
51 changed files with 191 additions and 191 deletions
--- a/12
+++ b/12
@ -3916,14 +3916,14 @@ grpc_cc_library(
 grpc_cc_library(
    name = "httpcli",
    srcs = [
-        "//src/core:lib/http/format_request.cc",
-        "//src/core:lib/http/httpcli.cc",
-        "//src/core:lib/http/parser.cc",
+        "//src/core:util/http_client/format_request.cc",
+        "//src/core:util/http_client/httpcli.cc",
+        "//src/core:util/http_client/parser.cc",
    ],
    hdrs = [
-        "//src/core:lib/http/format_request.h",
-        "//src/core:lib/http/httpcli.h",
-        "//src/core:lib/http/parser.h",
+        "//src/core:util/http_client/format_request.h",
+        "//src/core:util/http_client/httpcli.h",
+        "//src/core:util/http_client/parser.h",
    ],
    external_deps = [
        "absl/base:core_headers",
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -2315,10 +2315,6 @@ add_library(grpc
  src/core/lib/gprpp/validation_errors.cc
  src/core/lib/gprpp/windows/directory_reader.cc
  src/core/lib/gprpp/work_serializer.cc
-  src/core/lib/http/format_request.cc
-  src/core/lib/http/httpcli.cc
-  src/core/lib/http/httpcli_security_connector.cc
-  src/core/lib/http/parser.cc
  src/core/lib/iomgr/buffer_list.cc
  src/core/lib/iomgr/call_combiner.cc
  src/core/lib/iomgr/cfstream_handle.cc
@ -2608,6 +2604,10 @@ add_library(grpc
  src/core/tsi/ssl_transport_security_utils.cc
  src/core/tsi/transport_security.cc
  src/core/tsi/transport_security_grpc.cc
+  src/core/util/http_client/format_request.cc
+  src/core/util/http_client/httpcli.cc
+  src/core/util/http_client/httpcli_security_connector.cc
+  src/core/util/http_client/parser.cc
  src/core/util/json/json_object_loader.cc
  src/core/util/json/json_reader.cc
  src/core/util/json/json_util.cc
@ -3109,9 +3109,6 @@ add_library(grpc_unsecure
  src/core/lib/gprpp/uuid_v4.cc
  src/core/lib/gprpp/validation_errors.cc
  src/core/lib/gprpp/work_serializer.cc
-  src/core/lib/http/format_request.cc
-  src/core/lib/http/httpcli.cc
-  src/core/lib/http/parser.cc
  src/core/lib/iomgr/buffer_list.cc
  src/core/lib/iomgr/call_combiner.cc
  src/core/lib/iomgr/cfstream_handle.cc
@ -3329,6 +3326,9 @@ add_library(grpc_unsecure
  src/core/tsi/local_transport_security.cc
  src/core/tsi/transport_security.cc
  src/core/tsi/transport_security_grpc.cc
+  src/core/util/http_client/format_request.cc
+  src/core/util/http_client/httpcli.cc
+  src/core/util/http_client/parser.cc
  src/core/util/json/json_object_loader.cc
  src/core/util/json/json_reader.cc
  src/core/util/json/json_writer.cc
--- a/8
+++ b/8
@ -1165,10 +1165,6 @@ LIBGRPC_SRC = \
    src/core/lib/gprpp/windows/stat.cc \
    src/core/lib/gprpp/windows/thd.cc \
    src/core/lib/gprpp/work_serializer.cc \
-    src/core/lib/http/format_request.cc \
-    src/core/lib/http/httpcli.cc \
-    src/core/lib/http/httpcli_security_connector.cc \
-    src/core/lib/http/parser.cc \
    src/core/lib/iomgr/buffer_list.cc \
    src/core/lib/iomgr/call_combiner.cc \
    src/core/lib/iomgr/cfstream_handle.cc \
@ -1461,6 +1457,10 @@ LIBGRPC_SRC = \
    src/core/util/alloc.cc \
    src/core/util/android/log.cc \
    src/core/util/atm.cc \
+    src/core/util/http_client/format_request.cc \
+    src/core/util/http_client/httpcli.cc \
+    src/core/util/http_client/httpcli_security_connector.cc \
+    src/core/util/http_client/parser.cc \
    src/core/util/iphone/cpu.cc \
    src/core/util/json/json_object_loader.cc \
    src/core/util/json/json_reader.cc \
--- a/Package.swift
+++ b/Package.swift
@ -1323,14 +1323,6 @@ let package = Package(
        "src/core/lib/gprpp/work_serializer.cc",
        "src/core/lib/gprpp/work_serializer.h",
        "src/core/lib/gprpp/xxhash_inline.h",
-        "src/core/lib/http/format_request.cc",
-        "src/core/lib/http/format_request.h",
-        "src/core/lib/http/httpcli.cc",
-        "src/core/lib/http/httpcli.h",
-        "src/core/lib/http/httpcli_security_connector.cc",
-        "src/core/lib/http/httpcli_ssl_credentials.h",
-        "src/core/lib/http/parser.cc",
-        "src/core/lib/http/parser.h",
        "src/core/lib/iomgr/block_annotate.h",
        "src/core/lib/iomgr/buffer_list.cc",
        "src/core/lib/iomgr/buffer_list.h",
@ -1924,6 +1916,14 @@ let package = Package(
        "src/core/util/alloc.h",
        "src/core/util/android/log.cc",
        "src/core/util/atm.cc",
+        "src/core/util/http_client/format_request.cc",
+        "src/core/util/http_client/format_request.h",
+        "src/core/util/http_client/httpcli.cc",
+        "src/core/util/http_client/httpcli.h",
+        "src/core/util/http_client/httpcli_security_connector.cc",
+        "src/core/util/http_client/httpcli_ssl_credentials.h",
+        "src/core/util/http_client/parser.cc",
+        "src/core/util/http_client/parser.h",
        "src/core/util/iphone/cpu.cc",
        "src/core/util/json/json.h",
        "src/core/util/json/json_args.h",
--- a/build_autogenerated.yaml
+++ b/build_autogenerated.yaml
@ -910,10 +910,6 @@ libs:
  - src/core/lib/gprpp/validation_errors.h
  - src/core/lib/gprpp/work_serializer.h
  - src/core/lib/gprpp/xxhash_inline.h
-  - src/core/lib/http/format_request.h
-  - src/core/lib/http/httpcli.h
-  - src/core/lib/http/httpcli_ssl_credentials.h
-  - src/core/lib/http/parser.h
  - src/core/lib/iomgr/block_annotate.h
  - src/core/lib/iomgr/buffer_list.h
  - src/core/lib/iomgr/call_combiner.h
@ -1210,6 +1206,10 @@ libs:
  - src/core/tsi/transport_security.h
  - src/core/tsi/transport_security_grpc.h
  - src/core/tsi/transport_security_interface.h
+  - src/core/util/http_client/format_request.h
+  - src/core/util/http_client/httpcli.h
+  - src/core/util/http_client/httpcli_ssl_credentials.h
+  - src/core/util/http_client/parser.h
  - src/core/util/json/json.h
  - src/core/util/json/json_args.h
  - src/core/util/json/json_channel_args.h
@ -1731,10 +1731,6 @@ libs:
  - src/core/lib/gprpp/validation_errors.cc
  - src/core/lib/gprpp/windows/directory_reader.cc
  - src/core/lib/gprpp/work_serializer.cc
-  - src/core/lib/http/format_request.cc
-  - src/core/lib/http/httpcli.cc
-  - src/core/lib/http/httpcli_security_connector.cc
-  - src/core/lib/http/parser.cc
  - src/core/lib/iomgr/buffer_list.cc
  - src/core/lib/iomgr/call_combiner.cc
  - src/core/lib/iomgr/cfstream_handle.cc
@ -2024,6 +2020,10 @@ libs:
  - src/core/tsi/ssl_transport_security_utils.cc
  - src/core/tsi/transport_security.cc
  - src/core/tsi/transport_security_grpc.cc
+  - src/core/util/http_client/format_request.cc
+  - src/core/util/http_client/httpcli.cc
+  - src/core/util/http_client/httpcli_security_connector.cc
+  - src/core/util/http_client/parser.cc
  - src/core/util/json/json_object_loader.cc
  - src/core/util/json/json_reader.cc
  - src/core/util/json/json_util.cc
@ -2453,9 +2453,6 @@ libs:
  - src/core/lib/gprpp/uuid_v4.h
  - src/core/lib/gprpp/validation_errors.h
  - src/core/lib/gprpp/work_serializer.h
-  - src/core/lib/http/format_request.h
-  - src/core/lib/http/httpcli.h
-  - src/core/lib/http/parser.h
  - src/core/lib/iomgr/block_annotate.h
  - src/core/lib/iomgr/buffer_list.h
  - src/core/lib/iomgr/call_combiner.h
@ -2688,6 +2685,9 @@ libs:
  - src/core/tsi/transport_security.h
  - src/core/tsi/transport_security_grpc.h
  - src/core/tsi/transport_security_interface.h
+  - src/core/util/http_client/format_request.h
+  - src/core/util/http_client/httpcli.h
+  - src/core/util/http_client/parser.h
  - src/core/util/json/json.h
  - src/core/util/json/json_args.h
  - src/core/util/json/json_channel_args.h
@ -2889,9 +2889,6 @@ libs:
  - src/core/lib/gprpp/uuid_v4.cc
  - src/core/lib/gprpp/validation_errors.cc
  - src/core/lib/gprpp/work_serializer.cc
-  - src/core/lib/http/format_request.cc
-  - src/core/lib/http/httpcli.cc
-  - src/core/lib/http/parser.cc
  - src/core/lib/iomgr/buffer_list.cc
  - src/core/lib/iomgr/call_combiner.cc
  - src/core/lib/iomgr/cfstream_handle.cc
@ -3109,6 +3106,9 @@ libs:
  - src/core/tsi/local_transport_security.cc
  - src/core/tsi/transport_security.cc
  - src/core/tsi/transport_security_grpc.cc
+  - src/core/util/http_client/format_request.cc
+  - src/core/util/http_client/httpcli.cc
+  - src/core/util/http_client/parser.cc
  - src/core/util/json/json_object_loader.cc
  - src/core/util/json/json_reader.cc
  - src/core/util/json/json_writer.cc
--- a/config.m4
+++ b/config.m4
@ -540,10 +540,6 @@ if test "$PHP_GRPC" != "no"; then
    src/core/lib/gprpp/windows/stat.cc \
    src/core/lib/gprpp/windows/thd.cc \
    src/core/lib/gprpp/work_serializer.cc \
-    src/core/lib/http/format_request.cc \
-    src/core/lib/http/httpcli.cc \
-    src/core/lib/http/httpcli_security_connector.cc \
-    src/core/lib/http/parser.cc \
    src/core/lib/iomgr/buffer_list.cc \
    src/core/lib/iomgr/call_combiner.cc \
    src/core/lib/iomgr/cfstream_handle.cc \
@ -836,6 +832,10 @@ if test "$PHP_GRPC" != "no"; then
    src/core/util/alloc.cc \
    src/core/util/android/log.cc \
    src/core/util/atm.cc \
+    src/core/util/http_client/format_request.cc \
+    src/core/util/http_client/httpcli.cc \
+    src/core/util/http_client/httpcli_security_connector.cc \
+    src/core/util/http_client/parser.cc \
    src/core/util/iphone/cpu.cc \
    src/core/util/json/json_object_loader.cc \
    src/core/util/json/json_reader.cc \
@ -1534,7 +1534,6 @@ if test "$PHP_GRPC" != "no"; then
  PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/gprpp/linux)
  PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/gprpp/posix)
  PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/gprpp/windows)
-  PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/http)
  PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/iomgr)
  PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/iomgr/event_engine_shims)
  PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/matchers)
@ -1605,6 +1604,7 @@ if test "$PHP_GRPC" != "no"; then
  PHP_ADD_BUILD_DIR($ext_builddir/src/core/tsi/ssl/session_cache)
  PHP_ADD_BUILD_DIR($ext_builddir/src/core/util)
  PHP_ADD_BUILD_DIR($ext_builddir/src/core/util/android)
+  PHP_ADD_BUILD_DIR($ext_builddir/src/core/util/http_client)
  PHP_ADD_BUILD_DIR($ext_builddir/src/core/util/iphone)
  PHP_ADD_BUILD_DIR($ext_builddir/src/core/util/json)
  PHP_ADD_BUILD_DIR($ext_builddir/src/core/util/linux)
--- a/config.w32
+++ b/config.w32
@ -505,10 +505,6 @@ if (PHP_GRPC != "no") {
    "src\\core\\lib\\gprpp\\windows\\stat.cc " +
    "src\\core\\lib\\gprpp\\windows\\thd.cc " +
    "src\\core\\lib\\gprpp\\work_serializer.cc " +
-    "src\\core\\lib\\http\\format_request.cc " +
-    "src\\core\\lib\\http\\httpcli.cc " +
-    "src\\core\\lib\\http\\httpcli_security_connector.cc " +
-    "src\\core\\lib\\http\\parser.cc " +
    "src\\core\\lib\\iomgr\\buffer_list.cc " +
    "src\\core\\lib\\iomgr\\call_combiner.cc " +
    "src\\core\\lib\\iomgr\\cfstream_handle.cc " +
@ -801,6 +797,10 @@ if (PHP_GRPC != "no") {
    "src\\core\\util\\alloc.cc " +
    "src\\core\\util\\android\\log.cc " +
    "src\\core\\util\\atm.cc " +
+    "src\\core\\util\\http_client\\format_request.cc " +
+    "src\\core\\util\\http_client\\httpcli.cc " +
+    "src\\core\\util\\http_client\\httpcli_security_connector.cc " +
+    "src\\core\\util\\http_client\\parser.cc " +
    "src\\core\\util\\iphone\\cpu.cc " +
    "src\\core\\util\\json\\json_object_loader.cc " +
    "src\\core\\util\\json\\json_reader.cc " +
@ -1671,7 +1671,6 @@ if (PHP_GRPC != "no") {
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\lib\\gprpp\\linux");
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\lib\\gprpp\\posix");
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\lib\\gprpp\\windows");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\lib\\http");
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\lib\\iomgr");
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\lib\\iomgr\\event_engine_shims");
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\lib\\matchers");
@ -1745,6 +1744,7 @@ if (PHP_GRPC != "no") {
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\tsi\\ssl\\session_cache");
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\util");
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\util\\android");
+  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\util\\http_client");
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\util\\iphone");
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\util\\json");
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\util\\linux");
--- a/gRPC-C++.podspec
+++ b/gRPC-C++.podspec
@ -1008,10 +1008,6 @@ Pod::Spec.new do |s|
                      'src/core/lib/gprpp/validation_errors.h',
                      'src/core/lib/gprpp/work_serializer.h',
                      'src/core/lib/gprpp/xxhash_inline.h',
-                      'src/core/lib/http/format_request.h',
-                      'src/core/lib/http/httpcli.h',
-                      'src/core/lib/http/httpcli_ssl_credentials.h',
-                      'src/core/lib/http/parser.h',
                      'src/core/lib/iomgr/block_annotate.h',
                      'src/core/lib/iomgr/buffer_list.h',
                      'src/core/lib/iomgr/call_combiner.h',
@ -1309,6 +1305,10 @@ Pod::Spec.new do |s|
                      'src/core/tsi/transport_security_grpc.h',
                      'src/core/tsi/transport_security_interface.h',
                      'src/core/util/alloc.h',
+                      'src/core/util/http_client/format_request.h',
+                      'src/core/util/http_client/httpcli.h',
+                      'src/core/util/http_client/httpcli_ssl_credentials.h',
+                      'src/core/util/http_client/parser.h',
                      'src/core/util/json/json.h',
                      'src/core/util/json/json_args.h',
                      'src/core/util/json/json_channel_args.h',
@ -2283,10 +2283,6 @@ Pod::Spec.new do |s|
                              'src/core/lib/gprpp/validation_errors.h',
                              'src/core/lib/gprpp/work_serializer.h',
                              'src/core/lib/gprpp/xxhash_inline.h',
-                              'src/core/lib/http/format_request.h',
-                              'src/core/lib/http/httpcli.h',
-                              'src/core/lib/http/httpcli_ssl_credentials.h',
-                              'src/core/lib/http/parser.h',
                              'src/core/lib/iomgr/block_annotate.h',
                              'src/core/lib/iomgr/buffer_list.h',
                              'src/core/lib/iomgr/call_combiner.h',
@ -2584,6 +2580,10 @@ Pod::Spec.new do |s|
                              'src/core/tsi/transport_security_grpc.h',
                              'src/core/tsi/transport_security_interface.h',
                              'src/core/util/alloc.h',
+                              'src/core/util/http_client/format_request.h',
+                              'src/core/util/http_client/httpcli.h',
+                              'src/core/util/http_client/httpcli_ssl_credentials.h',
+                              'src/core/util/http_client/parser.h',
                              'src/core/util/json/json.h',
                              'src/core/util/json/json_args.h',
                              'src/core/util/json/json_channel_args.h',
--- a/gRPC-Core.podspec
+++ b/gRPC-Core.podspec
@ -1442,14 +1442,6 @@ Pod::Spec.new do |s|
                      'src/core/lib/gprpp/work_serializer.cc',
                      'src/core/lib/gprpp/work_serializer.h',
                      'src/core/lib/gprpp/xxhash_inline.h',
-                      'src/core/lib/http/format_request.cc',
-                      'src/core/lib/http/format_request.h',
-                      'src/core/lib/http/httpcli.cc',
-                      'src/core/lib/http/httpcli.h',
-                      'src/core/lib/http/httpcli_security_connector.cc',
-                      'src/core/lib/http/httpcli_ssl_credentials.h',
-                      'src/core/lib/http/parser.cc',
-                      'src/core/lib/http/parser.h',
                      'src/core/lib/iomgr/block_annotate.h',
                      'src/core/lib/iomgr/buffer_list.cc',
                      'src/core/lib/iomgr/buffer_list.h',
@ -2039,6 +2031,14 @@ Pod::Spec.new do |s|
                      'src/core/util/alloc.h',
                      'src/core/util/android/log.cc',
                      'src/core/util/atm.cc',
+                      'src/core/util/http_client/format_request.cc',
+                      'src/core/util/http_client/format_request.h',
+                      'src/core/util/http_client/httpcli.cc',
+                      'src/core/util/http_client/httpcli.h',
+                      'src/core/util/http_client/httpcli_security_connector.cc',
+                      'src/core/util/http_client/httpcli_ssl_credentials.h',
+                      'src/core/util/http_client/parser.cc',
+                      'src/core/util/http_client/parser.h',
                      'src/core/util/iphone/cpu.cc',
                      'src/core/util/json/json.h',
                      'src/core/util/json/json_args.h',
@ -3066,10 +3066,6 @@ Pod::Spec.new do |s|
                              'src/core/lib/gprpp/validation_errors.h',
                              'src/core/lib/gprpp/work_serializer.h',
                              'src/core/lib/gprpp/xxhash_inline.h',
-                              'src/core/lib/http/format_request.h',
-                              'src/core/lib/http/httpcli.h',
-                              'src/core/lib/http/httpcli_ssl_credentials.h',
-                              'src/core/lib/http/parser.h',
                              'src/core/lib/iomgr/block_annotate.h',
                              'src/core/lib/iomgr/buffer_list.h',
                              'src/core/lib/iomgr/call_combiner.h',
@ -3367,6 +3363,10 @@ Pod::Spec.new do |s|
                              'src/core/tsi/transport_security_grpc.h',
                              'src/core/tsi/transport_security_interface.h',
                              'src/core/util/alloc.h',
+                              'src/core/util/http_client/format_request.h',
+                              'src/core/util/http_client/httpcli.h',
+                              'src/core/util/http_client/httpcli_ssl_credentials.h',
+                              'src/core/util/http_client/parser.h',
                              'src/core/util/json/json.h',
                              'src/core/util/json/json_args.h',
                              'src/core/util/json/json_channel_args.h',
--- a/grpc.gemspec
+++ b/grpc.gemspec
@ -1329,14 +1329,6 @@ Gem::Specification.new do |s|
  s.files += %w( src/core/lib/gprpp/work_serializer.cc )
  s.files += %w( src/core/lib/gprpp/work_serializer.h )
  s.files += %w( src/core/lib/gprpp/xxhash_inline.h )
-  s.files += %w( src/core/lib/http/format_request.cc )
-  s.files += %w( src/core/lib/http/format_request.h )
-  s.files += %w( src/core/lib/http/httpcli.cc )
-  s.files += %w( src/core/lib/http/httpcli.h )
-  s.files += %w( src/core/lib/http/httpcli_security_connector.cc )
-  s.files += %w( src/core/lib/http/httpcli_ssl_credentials.h )
-  s.files += %w( src/core/lib/http/parser.cc )
-  s.files += %w( src/core/lib/http/parser.h )
  s.files += %w( src/core/lib/iomgr/block_annotate.h )
  s.files += %w( src/core/lib/iomgr/buffer_list.cc )
  s.files += %w( src/core/lib/iomgr/buffer_list.h )
@ -1926,6 +1918,14 @@ Gem::Specification.new do |s|
  s.files += %w( src/core/util/alloc.h )
  s.files += %w( src/core/util/android/log.cc )
  s.files += %w( src/core/util/atm.cc )
+  s.files += %w( src/core/util/http_client/format_request.cc )
+  s.files += %w( src/core/util/http_client/format_request.h )
+  s.files += %w( src/core/util/http_client/httpcli.cc )
+  s.files += %w( src/core/util/http_client/httpcli.h )
+  s.files += %w( src/core/util/http_client/httpcli_security_connector.cc )
+  s.files += %w( src/core/util/http_client/httpcli_ssl_credentials.h )
+  s.files += %w( src/core/util/http_client/parser.cc )
+  s.files += %w( src/core/util/http_client/parser.h )
  s.files += %w( src/core/util/iphone/cpu.cc )
  s.files += %w( src/core/util/json/json.h )
  s.files += %w( src/core/util/json/json_args.h )
--- a/package.xml
+++ b/package.xml
@ -1311,14 +1311,6 @@
    <file baseinstalldir="/" name="src/core/lib/gprpp/work_serializer.cc" role="src" />
    <file baseinstalldir="/" name="src/core/lib/gprpp/work_serializer.h" role="src" />
    <file baseinstalldir="/" name="src/core/lib/gprpp/xxhash_inline.h" role="src" />
-    <file baseinstalldir="/" name="src/core/lib/http/format_request.cc" role="src" />
-    <file baseinstalldir="/" name="src/core/lib/http/format_request.h" role="src" />
-    <file baseinstalldir="/" name="src/core/lib/http/httpcli.cc" role="src" />
-    <file baseinstalldir="/" name="src/core/lib/http/httpcli.h" role="src" />
-    <file baseinstalldir="/" name="src/core/lib/http/httpcli_security_connector.cc" role="src" />
-    <file baseinstalldir="/" name="src/core/lib/http/httpcli_ssl_credentials.h" role="src" />
-    <file baseinstalldir="/" name="src/core/lib/http/parser.cc" role="src" />
-    <file baseinstalldir="/" name="src/core/lib/http/parser.h" role="src" />
    <file baseinstalldir="/" name="src/core/lib/iomgr/block_annotate.h" role="src" />
    <file baseinstalldir="/" name="src/core/lib/iomgr/buffer_list.cc" role="src" />
    <file baseinstalldir="/" name="src/core/lib/iomgr/buffer_list.h" role="src" />
@ -1908,6 +1900,14 @@
    <file baseinstalldir="/" name="src/core/util/alloc.h" role="src" />
    <file baseinstalldir="/" name="src/core/util/android/log.cc" role="src" />
    <file baseinstalldir="/" name="src/core/util/atm.cc" role="src" />
+    <file baseinstalldir="/" name="src/core/util/http_client/format_request.cc" role="src" />
+    <file baseinstalldir="/" name="src/core/util/http_client/format_request.h" role="src" />
+    <file baseinstalldir="/" name="src/core/util/http_client/httpcli.cc" role="src" />
+    <file baseinstalldir="/" name="src/core/util/http_client/httpcli.h" role="src" />
+    <file baseinstalldir="/" name="src/core/util/http_client/httpcli_security_connector.cc" role="src" />
+    <file baseinstalldir="/" name="src/core/util/http_client/httpcli_ssl_credentials.h" role="src" />
+    <file baseinstalldir="/" name="src/core/util/http_client/parser.cc" role="src" />
+    <file baseinstalldir="/" name="src/core/util/http_client/parser.h" role="src" />
    <file baseinstalldir="/" name="src/core/util/iphone/cpu.cc" role="src" />
    <file baseinstalldir="/" name="src/core/util/json/json.h" role="src" />
    <file baseinstalldir="/" name="src/core/util/json/json_args.h" role="src" />
--- a/src/core/BUILD
+++ b/src/core/BUILD
@ -4422,10 +4422,10 @@ grpc_cc_library(
 grpc_cc_library(
    name = "httpcli_ssl_credentials",
    srcs = [
-        "lib/http/httpcli_security_connector.cc",
+        "util/http_client/httpcli_security_connector.cc",
    ],
    hdrs = [
-        "lib/http/httpcli_ssl_credentials.h",
+        "util/http_client/httpcli_ssl_credentials.h",
    ],
    external_deps = [
        "absl/log:log",
--- a/src/core/ext/gcp/metadata_query.h
+++ b/src/core/ext/gcp/metadata_query.h
@ -26,11 +26,11 @@

 #include "src/core/lib/gprpp/orphanable.h"
 #include "src/core/lib/gprpp/time.h"
-#include "src/core/lib/http/httpcli.h"
-#include "src/core/lib/http/parser.h"
 #include "src/core/lib/iomgr/closure.h"
 #include "src/core/lib/iomgr/error.h"
 #include "src/core/lib/iomgr/polling_entity.h"
+#include "src/core/util/http_client/httpcli.h"
+#include "src/core/util/http_client/parser.h"

 namespace grpc_core {

--- a/src/core/ext/transport/chttp2/transport/chttp2_transport.cc
+++ b/src/core/ext/transport/chttp2/transport/chttp2_transport.cc
@ -82,7 +82,6 @@
 #include "src/core/lib/gprpp/ref_counted.h"
 #include "src/core/lib/gprpp/status_helper.h"
 #include "src/core/lib/gprpp/time.h"
-#include "src/core/lib/http/parser.h"
 #include "src/core/lib/iomgr/combiner.h"
 #include "src/core/lib/iomgr/error.h"
 #include "src/core/lib/iomgr/exec_ctx.h"
@ -108,6 +107,7 @@
 #include "src/core/telemetry/stats.h"
 #include "src/core/telemetry/stats_data.h"
 #include "src/core/telemetry/tcp_tracer.h"
+#include "src/core/util/http_client/parser.h"
 #include "src/core/util/string.h"
 #include "src/core/util/useful.h"

--- a/src/core/handshaker/http_connect/http_connect_handshaker.cc
+++ b/src/core/handshaker/http_connect/http_connect_handshaker.cc
@ -44,14 +44,14 @@
 #include "src/core/lib/gprpp/debug_location.h"
 #include "src/core/lib/gprpp/ref_counted_ptr.h"
 #include "src/core/lib/gprpp/sync.h"
-#include "src/core/lib/http/format_request.h"
-#include "src/core/lib/http/parser.h"
 #include "src/core/lib/iomgr/closure.h"
 #include "src/core/lib/iomgr/endpoint.h"
 #include "src/core/lib/iomgr/error.h"
 #include "src/core/lib/iomgr/exec_ctx.h"
 #include "src/core/lib/iomgr/iomgr_fwd.h"
 #include "src/core/lib/iomgr/tcp_server.h"
+#include "src/core/util/http_client/format_request.h"
+#include "src/core/util/http_client/parser.h"
 #include "src/core/util/string.h"

 namespace grpc_core {
--- a/src/core/lib/config/config_vars.cc
+++ b/src/core/lib/config/config_vars.cc
@ -75,8 +75,6 @@ ABSL_FLAG(absl::optional<bool>, grpc_not_use_system_ssl_roots, {},
          "Disable loading system root certificates.");
 ABSL_FLAG(absl::optional<std::string>, grpc_ssl_cipher_suites, {},
          "A colon separated list of cipher suites to use with OpenSSL");
-ABSL_FLAG(absl::optional<bool>, grpc_absl_logging, {},
-          "Use absl logging from within gpr_log.");

 namespace grpc_core {

@ -94,8 +92,6 @@ ConfigVars::ConfigVars(const Overrides& overrides)
      not_use_system_ssl_roots_(LoadConfig(
          FLAGS_grpc_not_use_system_ssl_roots, "GRPC_NOT_USE_SYSTEM_SSL_ROOTS",
          overrides.not_use_system_ssl_roots, false)),
-      absl_logging_(LoadConfig(FLAGS_grpc_absl_logging, "GRPC_ABSL_LOGGING",
-                               overrides.absl_logging, true)),
      dns_resolver_(LoadConfig(FLAGS_grpc_dns_resolver, "GRPC_DNS_RESOLVER",
                               overrides.dns_resolver, "")),
      verbosity_(LoadConfig(FLAGS_grpc_verbosity, "GRPC_VERBOSITY",
@ -147,8 +143,7 @@ std::string ConfigVars::ToString() const {
      "\"", ", default_ssl_roots_file_path: ", "\"",
      absl::CEscape(DefaultSslRootsFilePath()), "\"",
      ", not_use_system_ssl_roots: ", NotUseSystemSslRoots() ? "true" : "false",
-      ", ssl_cipher_suites: ", "\"", absl::CEscape(SslCipherSuites()), "\"",
-      ", absl_logging: ", AbslLogging() ? "true" : "false");
+      ", ssl_cipher_suites: ", "\"", absl::CEscape(SslCipherSuites()), "\"");
 }

 }  // namespace grpc_core
--- a/src/core/lib/config/config_vars.h
+++ b/src/core/lib/config/config_vars.h
@ -38,7 +38,6 @@ class GPR_DLL ConfigVars {
    absl::optional<bool> enable_fork_support;
    absl::optional<bool> abort_on_leaks;
    absl::optional<bool> not_use_system_ssl_roots;
-    absl::optional<bool> absl_logging;
    absl::optional<std::string> dns_resolver;
    absl::optional<std::string> verbosity;
    absl::optional<std::string> stacktrace_minloglevel;
@ -103,8 +102,6 @@ class GPR_DLL ConfigVars {
  bool NotUseSystemSslRoots() const { return not_use_system_ssl_roots_; }
  // A colon separated list of cipher suites to use with OpenSSL
  absl::string_view SslCipherSuites() const { return ssl_cipher_suites_; }
-  // Use absl logging from within gpr_log.
-  bool AbslLogging() const { return absl_logging_; }

 private:
  explicit ConfigVars(const Overrides& overrides);
@ -114,7 +111,6 @@ class GPR_DLL ConfigVars {
  bool enable_fork_support_;
  bool abort_on_leaks_;
  bool not_use_system_ssl_roots_;
-  bool absl_logging_;
  std::string dns_resolver_;
  std::string verbosity_;
  std::string stacktrace_minloglevel_;
--- a/src/core/lib/config/config_vars.yaml
+++ b/src/core/lib/config/config_vars.yaml
@ -126,8 +126,3 @@
    ECDHE-ECDSA-AES256-GCM-SHA384:\
    ECDHE-RSA-AES128-GCM-SHA256:\
    ECDHE-RSA-AES256-GCM-SHA384"
- name: absl_logging
-  type: bool
-  default: true
-  description:
-    Use absl logging from within gpr_log.
--- a/src/core/lib/resource_quota/arena.cc
+++ b/src/core/lib/resource_quota/arena.cc
@ -36,8 +36,9 @@ void* ArenaStorage(size_t& initial_size) {
  static constexpr size_t base_size =
      GPR_ROUND_UP_TO_ALIGNMENT_SIZE(sizeof(Arena));
  initial_size = GPR_ROUND_UP_TO_ALIGNMENT_SIZE(initial_size);
-  initial_size = std::max(initial_size,
-                          arena_detail::BaseArenaContextTraits::ContextSize());
+  initial_size = std::max(
+      initial_size, GPR_ROUND_UP_TO_ALIGNMENT_SIZE(
+                        arena_detail::BaseArenaContextTraits::ContextSize()));
  size_t alloc_size = base_size + initial_size;
  static constexpr size_t alignment =
      (GPR_CACHELINE_SIZE > GPR_MAX_ALIGNMENT &&
@ -76,7 +77,8 @@ RefCountedPtr<Arena> Arena::Create(size_t initial_size,

 Arena::Arena(size_t initial_size, RefCountedPtr<ArenaFactory> arena_factory)
    : initial_zone_size_(initial_size),
-      total_used_(arena_detail::BaseArenaContextTraits::ContextSize()),
+      total_used_(GPR_ROUND_UP_TO_ALIGNMENT_SIZE(
+          arena_detail::BaseArenaContextTraits::ContextSize())),
      arena_factory_(std::move(arena_factory)) {
  for (size_t i = 0; i < arena_detail::BaseArenaContextTraits::NumContexts();
       ++i) {
--- a/src/core/lib/security/credentials/external/aws_external_account_credentials.cc
+++ b/src/core/lib/security/credentials/external/aws_external_account_credentials.cc
@ -39,10 +39,10 @@
 #include <grpc/support/string_util.h>

 #include "src/core/lib/gprpp/env.h"
-#include "src/core/lib/http/httpcli_ssl_credentials.h"
 #include "src/core/lib/iomgr/closure.h"
 #include "src/core/lib/security/credentials/credentials.h"
 #include "src/core/lib/uri/uri_parser.h"
+#include "src/core/util/http_client/httpcli_ssl_credentials.h"
 #include "src/core/util/json/json.h"
 #include "src/core/util/json/json_reader.h"
 #include "src/core/util/json/json_writer.h"
--- a/src/core/lib/security/credentials/external/aws_external_account_credentials.h
+++ b/src/core/lib/security/credentials/external/aws_external_account_credentials.h
@ -28,11 +28,11 @@

 #include "src/core/lib/gprpp/orphanable.h"
 #include "src/core/lib/gprpp/ref_counted_ptr.h"
-#include "src/core/lib/http/httpcli.h"
-#include "src/core/lib/http/parser.h"
 #include "src/core/lib/iomgr/error.h"
 #include "src/core/lib/security/credentials/external/aws_request_signer.h"
 #include "src/core/lib/security/credentials/external/external_account_credentials.h"
+#include "src/core/util/http_client/httpcli.h"
+#include "src/core/util/http_client/parser.h"

 namespace grpc_core {

--- a/src/core/lib/security/credentials/external/external_account_credentials.cc
+++ b/src/core/lib/security/credentials/external/external_account_credentials.cc
@ -46,14 +46,14 @@
 #include <grpc/support/string_util.h>

 #include "src/core/lib/gprpp/status_helper.h"
-#include "src/core/lib/http/httpcli_ssl_credentials.h"
-#include "src/core/lib/http/parser.h"
 #include "src/core/lib/security/credentials/credentials.h"
 #include "src/core/lib/security/credentials/external/aws_external_account_credentials.h"
 #include "src/core/lib/security/credentials/external/file_external_account_credentials.h"
 #include "src/core/lib/security/credentials/external/url_external_account_credentials.h"
 #include "src/core/lib/security/util/json_util.h"
 #include "src/core/lib/uri/uri_parser.h"
+#include "src/core/util/http_client/httpcli_ssl_credentials.h"
+#include "src/core/util/http_client/parser.h"
 #include "src/core/util/json/json_reader.h"
 #include "src/core/util/json/json_writer.h"

--- a/src/core/lib/security/credentials/external/external_account_credentials.h
+++ b/src/core/lib/security/credentials/external/external_account_credentials.h
@ -30,12 +30,12 @@
 #include "src/core/lib/gprpp/orphanable.h"
 #include "src/core/lib/gprpp/ref_counted_ptr.h"
 #include "src/core/lib/gprpp/time.h"
-#include "src/core/lib/http/httpcli.h"
-#include "src/core/lib/http/parser.h"
 #include "src/core/lib/iomgr/closure.h"
 #include "src/core/lib/iomgr/error.h"
 #include "src/core/lib/iomgr/polling_entity.h"
 #include "src/core/lib/security/credentials/oauth2/oauth2_credentials.h"
+#include "src/core/util/http_client/httpcli.h"
+#include "src/core/util/http_client/parser.h"
 #include "src/core/util/json/json.h"

 namespace grpc_core {
--- a/src/core/lib/security/credentials/external/url_external_account_credentials.cc
+++ b/src/core/lib/security/credentials/external/url_external_account_credentials.cc
@ -37,11 +37,11 @@
 #include <grpc/support/port_platform.h>
 #include <grpc/support/string_util.h>

-#include "src/core/lib/http/httpcli_ssl_credentials.h"
-#include "src/core/lib/http/parser.h"
 #include "src/core/lib/iomgr/closure.h"
 #include "src/core/lib/security/credentials/credentials.h"
 #include "src/core/lib/transport/error_utils.h"
+#include "src/core/util/http_client/httpcli_ssl_credentials.h"
+#include "src/core/util/http_client/parser.h"
 #include "src/core/util/json/json.h"
 #include "src/core/util/json/json_reader.h"

--- a/src/core/lib/security/credentials/external/url_external_account_credentials.h
+++ b/src/core/lib/security/credentials/external/url_external_account_credentials.h
@ -28,10 +28,10 @@

 #include "src/core/lib/gprpp/orphanable.h"
 #include "src/core/lib/gprpp/ref_counted_ptr.h"
-#include "src/core/lib/http/httpcli.h"
 #include "src/core/lib/iomgr/error.h"
 #include "src/core/lib/security/credentials/external/external_account_credentials.h"
 #include "src/core/lib/uri/uri_parser.h"
+#include "src/core/util/http_client/httpcli.h"

 namespace grpc_core {

--- a/src/core/lib/security/credentials/google_default/google_default_credentials.cc
+++ b/src/core/lib/security/credentials/google_default/google_default_credentials.cc
@ -49,8 +49,6 @@
 #include "src/core/lib/gprpp/status_helper.h"
 #include "src/core/lib/gprpp/sync.h"
 #include "src/core/lib/gprpp/time.h"
-#include "src/core/lib/http/httpcli.h"
-#include "src/core/lib/http/parser.h"
 #include "src/core/lib/iomgr/closure.h"
 #include "src/core/lib/iomgr/error.h"
 #include "src/core/lib/iomgr/exec_ctx.h"
@ -70,6 +68,8 @@
 #include "src/core/lib/uri/uri_parser.h"
 #include "src/core/load_balancing/grpclb/grpclb.h"
 #include "src/core/load_balancing/xds/xds_channel_args.h"
+#include "src/core/util/http_client/httpcli.h"
+#include "src/core/util/http_client/parser.h"
 #include "src/core/util/json/json.h"
 #include "src/core/util/json/json_reader.h"

--- a/src/core/lib/security/credentials/jwt/jwt_verifier.cc
+++ b/src/core/lib/security/credentials/jwt/jwt_verifier.cc
@ -58,9 +58,6 @@
 #include "src/core/lib/gprpp/manual_constructor.h"
 #include "src/core/lib/gprpp/memory.h"
 #include "src/core/lib/gprpp/orphanable.h"
-#include "src/core/lib/http/httpcli.h"
-#include "src/core/lib/http/httpcli_ssl_credentials.h"
-#include "src/core/lib/http/parser.h"
 #include "src/core/lib/iomgr/closure.h"
 #include "src/core/lib/iomgr/error.h"
 #include "src/core/lib/iomgr/exec_ctx.h"
@ -71,6 +68,9 @@
 #include "src/core/lib/slice/slice_internal.h"
 #include "src/core/lib/uri/uri_parser.h"
 #include "src/core/tsi/ssl_types.h"
+#include "src/core/util/http_client/httpcli.h"
+#include "src/core/util/http_client/httpcli_ssl_credentials.h"
+#include "src/core/util/http_client/parser.h"
 #include "src/core/util/json/json_reader.h"
 #include "src/core/util/string.h"

--- a/src/core/lib/security/credentials/oauth2/oauth2_credentials.cc
+++ b/src/core/lib/security/credentials/oauth2/oauth2_credentials.cc
@ -51,7 +51,6 @@
 #include "src/core/lib/gprpp/memory.h"
 #include "src/core/lib/gprpp/ref_counted_ptr.h"
 #include "src/core/lib/gprpp/status_helper.h"
-#include "src/core/lib/http/httpcli_ssl_credentials.h"
 #include "src/core/lib/iomgr/error.h"
 #include "src/core/lib/iomgr/pollset_set.h"
 #include "src/core/lib/promise/context.h"
@ -62,6 +61,7 @@
 #include "src/core/lib/transport/error_utils.h"
 #include "src/core/lib/transport/metadata_batch.h"
 #include "src/core/lib/uri/uri_parser.h"
+#include "src/core/util/http_client/httpcli_ssl_credentials.h"
 #include "src/core/util/json/json.h"
 #include "src/core/util/json/json_reader.h"

--- a/src/core/lib/security/credentials/oauth2/oauth2_credentials.h
+++ b/src/core/lib/security/credentials/oauth2/oauth2_credentials.h
@ -37,8 +37,6 @@
 #include "src/core/lib/gprpp/ref_counted_ptr.h"
 #include "src/core/lib/gprpp/time.h"
 #include "src/core/lib/gprpp/unique_type_name.h"
-#include "src/core/lib/http/httpcli.h"
-#include "src/core/lib/http/parser.h"
 #include "src/core/lib/iomgr/closure.h"
 #include "src/core/lib/iomgr/error.h"
 #include "src/core/lib/iomgr/polling_entity.h"
@ -48,6 +46,8 @@
 #include "src/core/lib/slice/slice.h"
 #include "src/core/lib/transport/transport.h"
 #include "src/core/lib/uri/uri_parser.h"
+#include "src/core/util/http_client/httpcli.h"
+#include "src/core/util/http_client/parser.h"
 #include "src/core/util/json/json.h"
 #include "src/core/util/useful.h"

--- a/src/core/util/http_client/format_request.cc
+++ b/src/core/util/http_client/format_request.cc
@ -16,7 +16,9 @@
 //
 //

-#include "src/core/lib/http/format_request.h"
+#include <grpc/support/port_platform.h>
+
+#include "src/core/util/http_client/format_request.h"

 #include <stdio.h>
 #include <string.h>
@ -31,9 +33,8 @@
 #include "absl/strings/string_view.h"

 #include <grpc/slice.h>
-#include <grpc/support/port_platform.h>

-#include "src/core/lib/http/httpcli.h"
+#include "src/core/util/http_client/httpcli.h"

 static void fill_common_header(const grpc_http_request* request,
                               const char* host, const char* path,
--- a/src/core/util/http_client/format_request.h
+++ b/src/core/util/http_client/format_request.h
@ -16,13 +16,14 @@
 //
 //

-#ifndef GRPC_SRC_CORE_LIB_HTTP_FORMAT_REQUEST_H
-#define GRPC_SRC_CORE_LIB_HTTP_FORMAT_REQUEST_H
+#ifndef GRPC_SRC_CORE_UTIL_HTTP_CLIENT_FORMAT_REQUEST_H
+#define GRPC_SRC_CORE_UTIL_HTTP_CLIENT_FORMAT_REQUEST_H

-#include <grpc/slice.h>
 #include <grpc/support/port_platform.h>

-#include "src/core/lib/http/parser.h"
+#include <grpc/slice.h>
+
+#include "src/core/util/http_client/parser.h"

 grpc_slice grpc_httpcli_format_get_request(const grpc_http_request* request,
                                           const char* host, const char* path);
@ -34,4 +35,4 @@ grpc_slice grpc_httpcli_format_connect_request(const grpc_http_request* request,
                                               const char* host,
                                               const char* path);

-#endif  // GRPC_SRC_CORE_LIB_HTTP_FORMAT_REQUEST_H
+#endif  // GRPC_SRC_CORE_UTIL_HTTP_CLIENT_FORMAT_REQUEST_H
--- a/src/core/util/http_client/httpcli.cc
+++ b/src/core/util/http_client/httpcli.cc
@ -16,7 +16,9 @@
 //
 //

-#include "src/core/lib/http/httpcli.h"
+#include <grpc/support/port_platform.h>
+
+#include "src/core/util/http_client/httpcli.h"

 #include <limits.h>

@ -32,7 +34,6 @@
 #include <grpc/slice_buffer.h>
 #include <grpc/support/alloc.h>
 #include <grpc/support/log.h>
-#include <grpc/support/port_platform.h>

 #include "src/core/handshaker/handshaker_registry.h"
 #include "src/core/handshaker/tcp_connect/tcp_connect_handshaker.h"
@ -41,8 +42,6 @@
 #include "src/core/lib/channel/channel_args_preconditioning.h"
 #include "src/core/lib/config/core_configuration.h"
 #include "src/core/lib/gprpp/status_helper.h"
-#include "src/core/lib/http/format_request.h"
-#include "src/core/lib/http/parser.h"
 #include "src/core/lib/iomgr/endpoint.h"
 #include "src/core/lib/iomgr/iomgr_internal.h"
 #include "src/core/lib/iomgr/pollset_set.h"
@ -52,6 +51,8 @@
 #include "src/core/lib/security/security_connector/security_connector.h"
 #include "src/core/lib/slice/slice.h"
 #include "src/core/lib/transport/error_utils.h"
+#include "src/core/util/http_client/format_request.h"
+#include "src/core/util/http_client/parser.h"

 namespace grpc_core {

--- a/src/core/util/http_client/httpcli.h
+++ b/src/core/util/http_client/httpcli.h
@ -16,8 +16,10 @@
 //
 //

-#ifndef GRPC_SRC_CORE_LIB_HTTP_HTTPCLI_H
-#define GRPC_SRC_CORE_LIB_HTTP_HTTPCLI_H
+#ifndef GRPC_SRC_CORE_UTIL_HTTP_CLIENT_HTTPCLI_H
+#define GRPC_SRC_CORE_UTIL_HTTP_CLIENT_HTTPCLI_H
+
+#include <grpc/support/port_platform.h>

 #include <stddef.h>

@ -32,7 +34,6 @@

 #include <grpc/grpc.h>
 #include <grpc/slice.h>
-#include <grpc/support/port_platform.h>

 #include "src/core/handshaker/handshaker.h"
 #include "src/core/lib/gprpp/debug_location.h"
@ -40,7 +41,6 @@
 #include "src/core/lib/gprpp/ref_counted_ptr.h"
 #include "src/core/lib/gprpp/sync.h"
 #include "src/core/lib/gprpp/time.h"
-#include "src/core/lib/http/parser.h"
 #include "src/core/lib/iomgr/closure.h"
 #include "src/core/lib/iomgr/endpoint.h"
 #include "src/core/lib/iomgr/error.h"
@ -52,6 +52,7 @@
 #include "src/core/lib/iomgr/resolved_address.h"
 #include "src/core/lib/resource_quota/resource_quota.h"
 #include "src/core/lib/uri/uri_parser.h"
+#include "src/core/util/http_client/parser.h"

 // User agent this library reports
 #define GRPC_HTTPCLI_USER_AGENT "grpc-httpcli/0.0"
@ -264,4 +265,4 @@ class HttpRequest : public InternallyRefCounted<HttpRequest> {

 }  // namespace grpc_core

-#endif  // GRPC_SRC_CORE_LIB_HTTP_HTTPCLI_H
+#endif  // GRPC_SRC_CORE_UTIL_HTTP_CLIENT_HTTPCLI_H
--- a/src/core/util/http_client/httpcli_security_connector.cc
+++ b/src/core/util/http_client/httpcli_security_connector.cc
@ -16,6 +16,8 @@
 //
 //

+#include <grpc/support/port_platform.h>
+
 #include <string.h>

 #include <string>
@ -32,7 +34,6 @@
 #include <grpc/impl/channel_arg_names.h>
 #include <grpc/support/alloc.h>
 #include <grpc/support/log.h>
-#include <grpc/support/port_platform.h>
 #include <grpc/support/string_util.h>

 #include "src/core/handshaker/handshaker.h"
--- a/src/core/util/http_client/httpcli_ssl_credentials.h
+++ b/src/core/util/http_client/httpcli_ssl_credentials.h
@ -14,12 +14,13 @@
 // limitations under the License.
 //

-#ifndef GRPC_SRC_CORE_LIB_HTTP_HTTPCLI_SSL_CREDENTIALS_H
-#define GRPC_SRC_CORE_LIB_HTTP_HTTPCLI_SSL_CREDENTIALS_H
+#ifndef GRPC_SRC_CORE_UTIL_HTTP_CLIENT_HTTPCLI_SSL_CREDENTIALS_H
+#define GRPC_SRC_CORE_UTIL_HTTP_CLIENT_HTTPCLI_SSL_CREDENTIALS_H

-#include <grpc/grpc.h>
 #include <grpc/support/port_platform.h>

+#include <grpc/grpc.h>
+
 #include "src/core/lib/gprpp/ref_counted_ptr.h"

 namespace grpc_core {
@ -35,4 +36,4 @@ RefCountedPtr<grpc_channel_credentials> CreateHttpRequestSSLCredentials();

 }  // namespace grpc_core

-#endif  // GRPC_SRC_CORE_LIB_HTTP_HTTPCLI_SSL_CREDENTIALS_H
+#endif  // GRPC_SRC_CORE_UTIL_HTTP_CLIENT_HTTPCLI_SSL_CREDENTIALS_H
--- a/src/core/util/http_client/parser.cc
+++ b/src/core/util/http_client/parser.cc
@ -16,7 +16,9 @@
 //
 //

-#include "src/core/lib/http/parser.h"
+#include <grpc/support/port_platform.h>
+
+#include "src/core/util/http_client/parser.h"

 #include <string.h>

@ -27,7 +29,6 @@

 #include <grpc/support/alloc.h>
 #include <grpc/support/log.h>
-#include <grpc/support/port_platform.h>

 grpc_core::TraceFlag grpc_http1_trace(false, "http1");

--- a/src/core/util/http_client/parser.h
+++ b/src/core/util/http_client/parser.h
@ -16,14 +16,15 @@
 //
 //

-#ifndef GRPC_SRC_CORE_LIB_HTTP_PARSER_H
-#define GRPC_SRC_CORE_LIB_HTTP_PARSER_H
+#ifndef GRPC_SRC_CORE_UTIL_HTTP_CLIENT_PARSER_H
+#define GRPC_SRC_CORE_UTIL_HTTP_CLIENT_PARSER_H
+
+#include <grpc/support/port_platform.h>

 #include <stddef.h>
 #include <stdint.h>

 #include <grpc/slice.h>
-#include <grpc/support/port_platform.h>

 #include "src/core/lib/debug/trace.h"
 #include "src/core/lib/iomgr/error.h"
@ -126,4 +127,4 @@ void grpc_http_response_destroy(grpc_http_response* response);

 extern grpc_core::TraceFlag grpc_http1_trace;

-#endif  // GRPC_SRC_CORE_LIB_HTTP_PARSER_H
+#endif  // GRPC_SRC_CORE_UTIL_HTTP_CLIENT_PARSER_H
--- a/src/python/grpcio/grpc_core_dependencies.py
+++ b/src/python/grpcio/grpc_core_dependencies.py
@ -514,10 +514,6 @@ CORE_SOURCE_FILES = [
    'src/core/lib/gprpp/windows/stat.cc',
    'src/core/lib/gprpp/windows/thd.cc',
    'src/core/lib/gprpp/work_serializer.cc',
-    'src/core/lib/http/format_request.cc',
-    'src/core/lib/http/httpcli.cc',
-    'src/core/lib/http/httpcli_security_connector.cc',
-    'src/core/lib/http/parser.cc',
    'src/core/lib/iomgr/buffer_list.cc',
    'src/core/lib/iomgr/call_combiner.cc',
    'src/core/lib/iomgr/cfstream_handle.cc',
@ -810,6 +806,10 @@ CORE_SOURCE_FILES = [
    'src/core/util/alloc.cc',
    'src/core/util/android/log.cc',
    'src/core/util/atm.cc',
+    'src/core/util/http_client/format_request.cc',
+    'src/core/util/http_client/httpcli.cc',
+    'src/core/util/http_client/httpcli_security_connector.cc',
+    'src/core/util/http_client/parser.cc',
    'src/core/util/iphone/cpu.cc',
    'src/core/util/json/json_object_loader.cc',
    'src/core/util/json/json_reader.cc',
--- a/test/core/end2end/fixtures/http_proxy_fixture.cc
+++ b/test/core/end2end/fixtures/http_proxy_fixture.cc
@ -51,7 +51,6 @@
 #include "src/core/lib/gprpp/status_helper.h"
 #include "src/core/lib/gprpp/thd.h"
 #include "src/core/lib/gprpp/time.h"
-#include "src/core/lib/http/parser.h"
 #include "src/core/lib/iomgr/closure.h"
 #include "src/core/lib/iomgr/combiner.h"
 #include "src/core/lib/iomgr/endpoint.h"
@ -65,6 +64,7 @@
 #include "src/core/lib/iomgr/sockaddr.h"
 #include "src/core/lib/iomgr/tcp_client.h"
 #include "src/core/lib/iomgr/tcp_server.h"
+#include "src/core/util/http_client/parser.h"
 #include "test/core/test_util/port.h"

 struct grpc_end2end_http_proxy {
--- a/test/core/http/format_request_test.cc
+++ b/test/core/http/format_request_test.cc
@ -16,7 +16,7 @@
 //
 //

-#include "src/core/lib/http/format_request.h"
+#include "src/core/util/http_client/format_request.h"

 #include <string.h>

@ -24,8 +24,8 @@

 #include "gtest/gtest.h"

-#include "src/core/lib/http/httpcli.h"
 #include "src/core/lib/slice/slice_internal.h"
+#include "src/core/util/http_client/httpcli.h"
 #include "test/core/test_util/test_config.h"

 TEST(FormatRequestTest, FormatGetRequest) {
--- a/test/core/http/httpcli_test.cc
+++ b/test/core/http/httpcli_test.cc
@ -16,7 +16,7 @@
 //
 //

-#include "src/core/lib/http/httpcli.h"
+#include "src/core/util/http_client/httpcli.h"

 #include <string.h>
 #include <sys/socket.h>
--- a/test/core/http/httpscli_test.cc
+++ b/test/core/http/httpscli_test.cc
@ -47,9 +47,6 @@
 #include "src/core/lib/gprpp/sync.h"
 #include "src/core/lib/gprpp/time.h"
 #include "src/core/lib/gprpp/time_util.h"
-#include "src/core/lib/http/httpcli.h"
-#include "src/core/lib/http/httpcli_ssl_credentials.h"
-#include "src/core/lib/http/parser.h"
 #include "src/core/lib/iomgr/closure.h"
 #include "src/core/lib/iomgr/error.h"
 #include "src/core/lib/iomgr/exec_ctx.h"
@ -58,6 +55,9 @@
 #include "src/core/lib/iomgr/pollset.h"
 #include "src/core/lib/security/credentials/credentials.h"  // IWYU pragma: keep
 #include "src/core/lib/uri/uri_parser.h"
+#include "src/core/util/http_client/httpcli.h"
+#include "src/core/util/http_client/httpcli_ssl_credentials.h"
+#include "src/core/util/http_client/parser.h"
 #include "src/core/util/subprocess.h"
 #include "test/core/http/httpcli_test_util.h"
 #include "test/core/test_util/fake_udp_and_tcp_server.h"
--- a/test/core/http/parser_test.cc
+++ b/test/core/http/parser_test.cc
@ -16,7 +16,7 @@
 //
 //

-#include "src/core/lib/http/parser.h"
+#include "src/core/util/http_client/parser.h"

 #include <stdarg.h>
 #include <string.h>
--- a/test/core/http/request_fuzzer.cc
+++ b/test/core/http/request_fuzzer.cc
@ -22,7 +22,7 @@
 #include <grpc/grpc.h>
 #include <grpc/slice.h>

-#include "src/core/lib/http/parser.h"
+#include "src/core/util/http_client/parser.h"

 bool squelch = true;
 bool leak_check = true;
--- a/test/core/http/response_fuzzer.cc
+++ b/test/core/http/response_fuzzer.cc
@ -22,7 +22,7 @@
 #include <grpc/grpc.h>
 #include <grpc/slice.h>

-#include "src/core/lib/http/parser.h"
+#include "src/core/util/http_client/parser.h"

 bool squelch = true;
 bool leak_check = true;
--- a/test/core/resource_quota/arena_test.cc
+++ b/test/core/resource_quota/arena_test.cc
@ -284,12 +284,16 @@ struct ArenaContextType<Foo> {
  static void Destroy(Foo* p) { p->~Foo(); }
 };

+struct alignas(16) VeryAligned {};
+
 TEST(ArenaTest, FooContext) {
  auto arena = SimpleArenaAllocator()->MakeArena();
  EXPECT_EQ(arena->GetContext<Foo>(), nullptr);
  arena->SetContext(arena->New<Foo>(42));
  ASSERT_NE(arena->GetContext<Foo>(), nullptr);
  EXPECT_EQ(*arena->GetContext<Foo>()->p, 42);
+  arena->New<VeryAligned>();
+  arena->New<VeryAligned>();
 }

 class MockArenaFactory : public ArenaFactory {
--- a/test/core/security/credentials_test.cc
+++ b/test/core/security/credentials_test.cc
@ -47,8 +47,6 @@
 #include "src/core/lib/gprpp/host_port.h"
 #include "src/core/lib/gprpp/time.h"
 #include "src/core/lib/gprpp/unique_type_name.h"
-#include "src/core/lib/http/httpcli.h"
-#include "src/core/lib/http/httpcli_ssl_credentials.h"
 #include "src/core/lib/iomgr/error.h"
 #include "src/core/lib/promise/exec_ctx_wakeup_scheduler.h"
 #include "src/core/lib/promise/promise.h"
@ -69,6 +67,8 @@
 #include "src/core/lib/security/transport/auth_filters.h"
 #include "src/core/lib/transport/error_utils.h"
 #include "src/core/lib/uri/uri_parser.h"
+#include "src/core/util/http_client/httpcli.h"
+#include "src/core/util/http_client/httpcli_ssl_credentials.h"
 #include "src/core/util/json/json_reader.h"
 #include "src/core/util/string.h"
 #include "src/core/util/tmpfile.h"
--- a/test/core/security/jwt_verifier_test.cc
+++ b/test/core/security/jwt_verifier_test.cc
@ -31,8 +31,8 @@
 #include <grpc/support/string_util.h>

 #include "src/core/lib/gprpp/crash.h"
-#include "src/core/lib/http/httpcli.h"
 #include "src/core/lib/security/credentials/jwt/json_token.h"
+#include "src/core/util/http_client/httpcli.h"
 #include "src/core/util/json/json_reader.h"
 #include "test/core/test_util/test_config.h"

--- a/test/core/test_util/port_server_client.cc
+++ b/test/core/test_util/port_server_client.cc
@ -44,8 +44,6 @@
 #include "src/core/lib/gprpp/ref_counted_ptr.h"
 #include "src/core/lib/gprpp/status_helper.h"
 #include "src/core/lib/gprpp/time.h"
-#include "src/core/lib/http/httpcli.h"
-#include "src/core/lib/http/parser.h"
 #include "src/core/lib/iomgr/closure.h"
 #include "src/core/lib/iomgr/error.h"
 #include "src/core/lib/iomgr/exec_ctx.h"
@ -54,6 +52,8 @@
 #include "src/core/lib/iomgr/pollset.h"
 #include "src/core/lib/security/credentials/credentials.h"
 #include "src/core/lib/uri/uri_parser.h"
+#include "src/core/util/http_client/httpcli.h"
+#include "src/core/util/http_client/parser.h"

 typedef struct freereq {
  gpr_mu* mu = nullptr;
--- a/tools/doxygen/Doxyfile.c++.internal
+++ b/tools/doxygen/Doxyfile.c++.internal
@ -2328,14 +2328,6 @@ src/core/lib/gprpp/windows/thd.cc \
 src/core/lib/gprpp/work_serializer.cc \
 src/core/lib/gprpp/work_serializer.h \
 src/core/lib/gprpp/xxhash_inline.h \
-src/core/lib/http/format_request.cc \
-src/core/lib/http/format_request.h \
-src/core/lib/http/httpcli.cc \
-src/core/lib/http/httpcli.h \
-src/core/lib/http/httpcli_security_connector.cc \
-src/core/lib/http/httpcli_ssl_credentials.h \
-src/core/lib/http/parser.cc \
-src/core/lib/http/parser.h \
 src/core/lib/iomgr/block_annotate.h \
 src/core/lib/iomgr/buffer_list.cc \
 src/core/lib/iomgr/buffer_list.h \
@ -2925,6 +2917,14 @@ src/core/util/alloc.cc \
 src/core/util/alloc.h \
 src/core/util/android/log.cc \
 src/core/util/atm.cc \
+src/core/util/http_client/format_request.cc \
+src/core/util/http_client/format_request.h \
+src/core/util/http_client/httpcli.cc \
+src/core/util/http_client/httpcli.h \
+src/core/util/http_client/httpcli_security_connector.cc \
+src/core/util/http_client/httpcli_ssl_credentials.h \
+src/core/util/http_client/parser.cc \
+src/core/util/http_client/parser.h \
 src/core/util/iphone/cpu.cc \
 src/core/util/json/json.h \
 src/core/util/json/json_args.h \
--- a/tools/doxygen/Doxyfile.core.internal
+++ b/tools/doxygen/Doxyfile.core.internal
@ -2101,14 +2101,6 @@ src/core/lib/gprpp/windows/thd.cc \
 src/core/lib/gprpp/work_serializer.cc \
 src/core/lib/gprpp/work_serializer.h \
 src/core/lib/gprpp/xxhash_inline.h \
-src/core/lib/http/format_request.cc \
-src/core/lib/http/format_request.h \
-src/core/lib/http/httpcli.cc \
-src/core/lib/http/httpcli.h \
-src/core/lib/http/httpcli_security_connector.cc \
-src/core/lib/http/httpcli_ssl_credentials.h \
-src/core/lib/http/parser.cc \
-src/core/lib/http/parser.h \
 src/core/lib/iomgr/README.md \
 src/core/lib/iomgr/block_annotate.h \
 src/core/lib/iomgr/buffer_list.cc \
@ -2707,6 +2699,14 @@ src/core/util/alloc.cc \
 src/core/util/alloc.h \
 src/core/util/android/log.cc \
 src/core/util/atm.cc \
+src/core/util/http_client/format_request.cc \
+src/core/util/http_client/format_request.h \
+src/core/util/http_client/httpcli.cc \
+src/core/util/http_client/httpcli.h \
+src/core/util/http_client/httpcli_security_connector.cc \
+src/core/util/http_client/httpcli_ssl_credentials.h \
+src/core/util/http_client/parser.cc \
+src/core/util/http_client/parser.h \
 src/core/util/iphone/cpu.cc \
 src/core/util/json/json.h \
 src/core/util/json/json_args.h \