Merge branch 'master' into arena-counting

9 months ago · d1b672fe30
parent faa7475bd3 1a96ce7620
commit d1b672fe30
51 changed files with 246 additions and 193 deletions
--- a/12
+++ b/12
@ -3916,14 +3916,14 @@ grpc_cc_library(
 grpc_cc_library(
    name = "httpcli",
    srcs = [
-        "//src/core:util/http_client/format_request.cc",
-        "//src/core:util/http_client/httpcli.cc",
-        "//src/core:util/http_client/parser.cc",
+        "//src/core:lib/http/format_request.cc",
+        "//src/core:lib/http/httpcli.cc",
+        "//src/core:lib/http/parser.cc",
    ],
    hdrs = [
-        "//src/core:util/http_client/format_request.h",
-        "//src/core:util/http_client/httpcli.h",
-        "//src/core:util/http_client/parser.h",
+        "//src/core:lib/http/format_request.h",
+        "//src/core:lib/http/httpcli.h",
+        "//src/core:lib/http/parser.h",
    ],
    external_deps = [
        "absl/base:core_headers",
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -2315,6 +2315,10 @@ 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
@ -2604,10 +2608,6 @@ 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,6 +3109,9 @@ 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
@ -3326,9 +3329,6 @@ 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,6 +1165,10 @@ 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 \
@ -1457,10 +1461,6 @@ 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,6 +1323,14 @@ 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",
@ -1916,14 +1924,6 @@ 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,6 +910,10 @@ 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
@ -1206,10 +1210,6 @@ 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,6 +1731,10 @@ 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
@ -2020,10 +2024,6 @@ 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,6 +2453,9 @@ 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
@ -2685,9 +2688,6 @@ 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,6 +2889,9 @@ 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
@ -3106,9 +3109,6 @@ 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,6 +540,10 @@ 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 \
@ -832,10 +836,6 @@ 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,6 +1534,7 @@ 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)
@ -1604,7 +1605,6 @@ 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,6 +505,10 @@ 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 " +
@ -797,10 +801,6 @@ 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,6 +1671,7 @@ 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");
@ -1744,7 +1745,6 @@ 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,6 +1008,10 @@ 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',
@ -1305,10 +1309,6 @@ 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,6 +2283,10 @@ 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',
@ -2580,10 +2584,6 @@ 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,6 +1442,14 @@ 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',
@ -2031,14 +2039,6 @@ 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,6 +3066,10 @@ 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',
@ -3363,10 +3367,6 @@ 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,6 +1329,14 @@ 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 )
@ -1918,14 +1926,6 @@ 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,6 +1311,14 @@
    <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" />
@ -1900,14 +1908,6 @@
    <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
@ -4421,10 +4421,10 @@ grpc_cc_library(
 grpc_cc_library(
    name = "httpcli_ssl_credentials",
    srcs = [
-        "util/http_client/httpcli_security_connector.cc",
+        "lib/http/httpcli_security_connector.cc",
    ],
    hdrs = [
-        "util/http_client/httpcli_ssl_credentials.h",
+        "lib/http/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,6 +82,7 @@
 #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"
@ -107,7 +108,6 @@
 #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/util/http_client/format_request.cc
+++ b/src/core/util/http_client/format_request.cc
@ -16,9 +16,7 @@
 //
 //

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

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

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

-#include "src/core/util/http_client/httpcli.h"
+#include "src/core/lib/http/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,14 +16,13 @@
 //
 //

-#ifndef GRPC_SRC_CORE_UTIL_HTTP_CLIENT_FORMAT_REQUEST_H
-#define GRPC_SRC_CORE_UTIL_HTTP_CLIENT_FORMAT_REQUEST_H
-
-#include <grpc/support/port_platform.h>
+#ifndef GRPC_SRC_CORE_LIB_HTTP_FORMAT_REQUEST_H
+#define GRPC_SRC_CORE_LIB_HTTP_FORMAT_REQUEST_H

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

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

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

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

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

 #include <limits.h>

@ -34,6 +32,7 @@
 #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"
@ -42,6 +41,8 @@
 #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"
@ -51,8 +52,6 @@
 #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,10 +16,8 @@
 //
 //

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

 #include <stddef.h>

@ -34,6 +32,7 @@

 #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"
@ -41,6 +40,7 @@
 #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,7 +52,6 @@
 #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"
@ -265,4 +264,4 @@ class HttpRequest : public InternallyRefCounted<HttpRequest> {

 }  // namespace grpc_core

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

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

 #include <string>
@ -34,6 +32,7 @@
 #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,11 @@
 // limitations under the License.
 //

-#ifndef GRPC_SRC_CORE_UTIL_HTTP_CLIENT_HTTPCLI_SSL_CREDENTIALS_H
-#define GRPC_SRC_CORE_UTIL_HTTP_CLIENT_HTTPCLI_SSL_CREDENTIALS_H
-
-#include <grpc/support/port_platform.h>
+#ifndef GRPC_SRC_CORE_LIB_HTTP_HTTPCLI_SSL_CREDENTIALS_H
+#define GRPC_SRC_CORE_LIB_HTTP_HTTPCLI_SSL_CREDENTIALS_H

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

 #include "src/core/lib/gprpp/ref_counted_ptr.h"

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

 }  // namespace grpc_core

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

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

 #include <string.h>

@ -29,6 +27,7 @@

 #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,15 +16,14 @@
 //
 //

-#ifndef GRPC_SRC_CORE_UTIL_HTTP_CLIENT_PARSER_H
-#define GRPC_SRC_CORE_UTIL_HTTP_CLIENT_PARSER_H
-
-#include <grpc/support/port_platform.h>
+#ifndef GRPC_SRC_CORE_LIB_HTTP_PARSER_H
+#define GRPC_SRC_CORE_LIB_HTTP_PARSER_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"
@ -127,4 +126,4 @@ void grpc_http_response_destroy(grpc_http_response* response);

 extern grpc_core::TraceFlag grpc_http1_trace;

-#endif  // GRPC_SRC_CORE_UTIL_HTTP_CLIENT_PARSER_H
+#endif  // GRPC_SRC_CORE_LIB_HTTP_PARSER_H
--- 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,6 +49,8 @@
 #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"
@ -68,8 +70,6 @@
 #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,6 +58,9 @@
 #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"
@ -68,9 +71,6 @@
 #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,6 +51,7 @@
 #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"
@ -61,7 +62,6 @@
 #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,6 +37,8 @@
 #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"
@ -46,8 +48,6 @@
 #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/python/grpcio/grpc/aio/_call.py
+++ b/src/python/grpcio/grpc/aio/_call.py
@ -19,7 +19,15 @@ from functools import partial
 import inspect
 import logging
 import traceback
-from typing import Any, AsyncIterator, Generator, Generic, Optional, Tuple
+from typing import (
+    Any,
+    AsyncIterator,
+    Generator,
+    Generic,
+    Optional,
+    Tuple,
+    Union,
+)

 import grpc
 from grpc import _common
@ -29,6 +37,7 @@ from . import _base_call
 from ._metadata import Metadata
 from ._typing import DeserializingFunction
 from ._typing import DoneCallbackType
+from ._typing import EOFType
 from ._typing import MetadatumType
 from ._typing import RequestIterableType
 from ._typing import RequestType
@ -380,7 +389,7 @@ class _StreamResponseMixin(Call):
                raw_response, self._response_deserializer
            )

-    async def read(self) -> ResponseType:
+    async def read(self) -> Union[EOFType, ResponseType]:
        if self.done():
            await self._raise_for_status()
            return cygrpc.EOF
--- a/src/python/grpcio/grpc/aio/_interceptor.py
+++ b/src/python/grpcio/grpc/aio/_interceptor.py
@ -43,6 +43,7 @@ from ._call import _RPC_HALF_CLOSED_DETAILS
 from ._metadata import Metadata
 from ._typing import DeserializingFunction
 from ._typing import DoneCallbackType
+from ._typing import EOFType
 from ._typing import RequestIterableType
 from ._typing import RequestType
 from ._typing import ResponseIterableType
@ -494,12 +495,15 @@ class _InterceptedStreamResponseMixin:
            )
        return self._response_aiter

-    async def read(self) -> ResponseType:
+    async def read(self) -> Union[EOFType, ResponseType]:
        if self._response_aiter is None:
            self._response_aiter = (
                self._wait_for_interceptor_task_response_iterator()
            )
-        return await self._response_aiter.asend(None)
+        try:
+            return await self._response_aiter.asend(None)
+        except StopAsyncIteration:
+            return cygrpc.EOF


 class _InterceptedStreamRequestMixin:
@ -1141,7 +1145,7 @@ class UnaryStreamCallResponseIterator(
 ):
    """UnaryStreamCall class wich uses an alternative response iterator."""

-    async def read(self) -> ResponseType:
+    async def read(self) -> Union[EOFType, ResponseType]:
        # Behind the scenes everyting goes through the
        # async iterator. So this path should not be reached.
        raise NotImplementedError()
@ -1152,7 +1156,7 @@ class StreamStreamCallResponseIterator(
 ):
    """StreamStreamCall class wich uses an alternative response iterator."""

-    async def read(self) -> ResponseType:
+    async def read(self) -> Union[EOFType, ResponseType]:
        # Behind the scenes everyting goes through the
        # async iterator. So this path should not be reached.
        raise NotImplementedError()
--- a/src/python/grpcio/grpc_core_dependencies.py
+++ b/src/python/grpcio/grpc_core_dependencies.py
@ -514,6 +514,10 @@ 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',
@ -806,10 +810,6 @@ 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/src/python/grpcio_tests/tests_aio/unit/client_unary_stream_interceptor_test.py
+++ b/src/python/grpcio_tests/tests_aio/unit/client_unary_stream_interceptor_test.py
@ -223,6 +223,54 @@ class TestUnaryStreamClientInterceptor(AioTestBase):

        await channel.close()

+    async def test_too_many_reads(self):
+        for interceptor_class in (
+            [_UnaryStreamInterceptorEmpty],
+            [_UnaryStreamInterceptorWithResponseIterator],
+            [],
+        ):
+            with self.subTest(name=interceptor_class):
+                if interceptor_class:
+                    interceptor = interceptor_class[0]()
+                    channel = aio.insecure_channel(
+                        self._server_target, interceptors=[interceptor]
+                    )
+                else:
+                    channel = aio.insecure_channel(self._server_target)
+                stub = test_pb2_grpc.TestServiceStub(channel)
+
+                request = messages_pb2.StreamingOutputCallRequest()
+                request.response_parameters.extend(
+                    [
+                        messages_pb2.ResponseParameters(
+                            size=_RESPONSE_PAYLOAD_SIZE
+                        )
+                    ]
+                    * _NUM_STREAM_RESPONSES
+                )
+
+                call = stub.StreamingOutputCall(request)
+
+                response_cnt = 0
+                for response in range(_NUM_STREAM_RESPONSES):
+                    response = await call.read()
+                    response_cnt += 1
+                    self.assertIs(
+                        type(response), messages_pb2.StreamingOutputCallResponse
+                    )
+                    self.assertEqual(
+                        _RESPONSE_PAYLOAD_SIZE, len(response.payload.body)
+                    )
+
+                # Additional read() should return EOF
+                self.assertIs(await call.read(), aio.EOF)
+
+                self.assertEqual(await call.code(), grpc.StatusCode.OK)
+                # After the RPC finished, the read should also produce EOF
+                self.assertIs(await call.read(), aio.EOF)
+
+                await channel.close()
+
    async def test_multiple_interceptors_response_iterator(self):
        for interceptor_class in (
            _UnaryStreamInterceptorEmpty,
--- a/test/core/end2end/fixtures/http_proxy_fixture.cc
+++ b/test/core/end2end/fixtures/http_proxy_fixture.cc
@ -51,6 +51,7 @@
 #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"
@ -64,7 +65,6 @@
 #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/util/http_client/format_request.h"
+#include "src/core/lib/http/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/util/http_client/httpcli.h"
+#include "src/core/lib/http/httpcli.h"

 #include <string.h>
 #include <sys/socket.h>
--- a/test/core/http/httpscli_test.cc
+++ b/test/core/http/httpscli_test.cc
@ -47,6 +47,9 @@
 #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"
@ -55,9 +58,6 @@
 #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/util/http_client/parser.h"
+#include "src/core/lib/http/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/util/http_client/parser.h"
+#include "src/core/lib/http/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/util/http_client/parser.h"
+#include "src/core/lib/http/parser.h"

 bool squelch = true;
 bool leak_check = true;
--- a/test/core/security/credentials_test.cc
+++ b/test/core/security/credentials_test.cc
@ -47,6 +47,8 @@
 #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"
@ -67,8 +69,6 @@
 #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,6 +44,8 @@
 #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"
@ -52,8 +54,6 @@
 #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,6 +2328,14 @@ 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 \
@ -2917,14 +2925,6 @@ 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,6 +2101,14 @@ 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 \
@ -2699,14 +2707,6 @@ 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/internal_ci/linux/grpc_e2e_performance_gke.sh
+++ b/tools/internal_ci/linux/grpc_e2e_performance_gke.sh
@ -131,9 +131,9 @@ configLangArgs32core+=( -l c++ )
 runnerLangArgs+=( -l "cxx:${GRPC_CORE_REPO}:${GRPC_CORE_COMMIT}" )

 # dotnet
-configLangArgs8core+=( -l dotnet )
-configLangArgs32core+=( -l dotnet )
-runnerLangArgs+=( -l "dotnet:${GRPC_DOTNET_REPO}:${GRPC_DOTNET_COMMIT}" )
+# configLangArgs8core+=( -l dotnet )
+# configLangArgs32core+=( -l dotnet )
+# runnerLangArgs+=( -l "dotnet:${GRPC_DOTNET_REPO}:${GRPC_DOTNET_COMMIT}" )

 # # go
 configLangArgs8core+=( -l go )
--- a/tools/internal_ci/linux/grpc_e2e_performance_gke_experiment.sh
+++ b/tools/internal_ci/linux/grpc_e2e_performance_gke_experiment.sh
@ -125,9 +125,9 @@ configLangArgs32core+=( -l c++ )
 runnerLangArgs+=( -l "cxx:${GRPC_CORE_REPO}:${GRPC_CORE_COMMIT}" )

 # dotnet
-configLangArgs8core+=( -l dotnet )
-configLangArgs32core+=( -l dotnet )
-runnerLangArgs+=( -l "dotnet:${GRPC_DOTNET_REPO}:${GRPC_DOTNET_COMMIT}" )
+# configLangArgs8core+=( -l dotnet )
+# configLangArgs32core+=( -l dotnet )
+# runnerLangArgs+=( -l "dotnet:${GRPC_DOTNET_REPO}:${GRPC_DOTNET_COMMIT}" )

 # # go
 configLangArgs8core+=( -l go )