Merge remote-tracking branch 'upstream/master' into fix-stream-compression-transport-duplicate

1 files changed, 3 insertions, 4 deletions

diff --git a/config.w32 b/config.w32
index 3dacc31e6a..5347baedc2 100644
--- a/config.w32
+++ b/config.w32
@@ -80,6 +80,7 @@ if (PHP_GRPC != "no") {
     "src\\core\\lib\\http\\format_request.c " +
     "src\\core\\lib\\http\\httpcli.c " +
     "src\\core\\lib\\http\\parser.c " +
+    "src\\core\\lib\\iomgr\\call_combiner.c " +
     "src\\core\\lib\\iomgr\\closure.c " +
     "src\\core\\lib\\iomgr\\combiner.c " +
     "src\\core\\lib\\iomgr\\endpoint.c " +
@@ -88,8 +89,6 @@ if (PHP_GRPC != "no") {
     "src\\core\\lib\\iomgr\\endpoint_pair_windows.c " +
     "src\\core\\lib\\iomgr\\error.c " +
     "src\\core\\lib\\iomgr\\ev_epoll1_linux.c " +
-    "src\\core\\lib\\iomgr\\ev_epoll_limited_pollers_linux.c " +
-    "src\\core\\lib\\iomgr\\ev_epoll_thread_pool_linux.c " +
     "src\\core\\lib\\iomgr\\ev_epollex_linux.c " +
     "src\\core\\lib\\iomgr\\ev_epollsig_linux.c " +
     "src\\core\\lib\\iomgr\\ev_poll_posix.c " +
@@ -302,8 +301,8 @@ if (PHP_GRPC != "no") {
     "src\\core\\ext\\filters\\client_channel\\resolver\\dns\\c_ares\\grpc_ares_wrapper_fallback.c " +
     "src\\core\\ext\\filters\\client_channel\\resolver\\dns\\native\\dns_resolver.c " +
     "src\\core\\ext\\filters\\client_channel\\resolver\\sockaddr\\sockaddr_resolver.c " +
-    "src\\core\\ext\\filters\\load_reporting\\load_reporting.c " +
-    "src\\core\\ext\\filters\\load_reporting\\load_reporting_filter.c " +
+    "src\\core\\ext\\filters\\load_reporting\\server_load_reporting_filter.c " +
+    "src\\core\\ext\\filters\\load_reporting\\server_load_reporting_plugin.c " +
     "src\\core\\ext\\census\\base_resources.c " +
     "src\\core\\ext\\census\\context.c " +
     "src\\core\\ext\\census\\gen\\census.pb.c " +