Skip to content

Commit 52d0c6c

Browse files
authored
Merge release 1.73.x to main (#336)
* remove cronet files * remove cronet files * Sync c-core 1.72.0-pre1 * use c++17 for swift package * update ios deployment target to 15.0 * Sync c-core 1.72.0 * Sync c-core 1.73.0-pre1 * include additional files * Re-sync c-core 1.73.0-pre1 * exclude inc files from swift package * upgrade abseil swift to 0.20250127.1 (#330) * Sync c-core 1.73.0-pre2 * Sync c-core 1.73.0 * Sync c-core 1.73.1
1 parent d88573f commit 52d0c6c

16 files changed

+179
-172
lines changed

Package.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ let package = Package(
2424
],
2525

2626
dependencies: [
27-
.package(url: "https://github.com/firebase/abseil-cpp-SwiftPM.git", "0.20240722.0"..<"0.20240723.0"),
27+
.package(url: "https://github.com/firebase/abseil-cpp-SwiftPM.git", "0.20250127.0"..<"0.20250128.0"),
2828
.package(url: "https://github.com/firebase/boringssl-SwiftPM.git", "0.32.0"..<"0.33.0"),
2929
],
3030

gRPC-C++.podspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
Pod::Spec.new do |s|
2323
s.name = 'gRPC-C++'
2424
# TODO (mxyan): use version that match gRPC version when pod is stabilized
25-
version = '1.73.0-pre1'
25+
version = '1.73.1'
2626
s.version = version
2727
s.summary = 'gRPC C++ library'
2828
s.homepage = 'https://grpc.io'

gRPC-Core.podspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121

2222
Pod::Spec.new do |s|
2323
s.name = 'gRPC-Core'
24-
version = '1.73.0-pre1'
24+
version = '1.73.1'
2525
s.version = version
2626
s.summary = 'Core cross-platform gRPC library, written in C'
2727
s.homepage = 'https://grpc.io'

gRPC-ProtoRPC.podspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121

2222
Pod::Spec.new do |s|
2323
s.name = 'gRPC-ProtoRPC'
24-
version = '1.73.0-pre1'
24+
version = '1.73.1'
2525
s.version = version
2626
s.summary = 'RPC library for Protocol Buffers, based on gRPC'
2727
s.homepage = 'https://grpc.io'

gRPC-RxLibrary.podspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121

2222
Pod::Spec.new do |s|
2323
s.name = 'gRPC-RxLibrary'
24-
version = '1.73.0-pre1'
24+
version = '1.73.1'
2525
s.version = version
2626
s.summary = 'Reactive Extensions library for iOS/OSX.'
2727
s.homepage = 'https://grpc.io'

gRPC.podspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020

2121
Pod::Spec.new do |s|
2222
s.name = 'gRPC'
23-
version = '1.73.0-pre1'
23+
version = '1.73.1'
2424
s.version = version
2525
s.summary = 'gRPC client library for iOS/OSX'
2626
s.homepage = 'https://grpc.io'

include/grpcpp/version_info.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@
2020

2121
#define GRPC_CPP_VERSION_MAJOR 1
2222
#define GRPC_CPP_VERSION_MINOR 73
23-
#define GRPC_CPP_VERSION_PATCH 0
24-
#define GRPC_CPP_VERSION_TAG "pre1"
25-
#define GRPC_CPP_VERSION_STRING "1.73.0-pre1"
23+
#define GRPC_CPP_VERSION_PATCH 1
24+
#define GRPC_CPP_VERSION_TAG ""
25+
#define GRPC_CPP_VERSION_STRING "1.73.1"
2626

27-
#endif // GRPCPP_VERSION_INFO_H
27+
#endif // GRPCPP_VERSION_INFO_H

src/core/client_channel/backup_poller.cc

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,10 +62,15 @@ static grpc_core::Duration g_poll_interval =
6262
static bool g_backup_polling_disabled;
6363

6464
void grpc_client_channel_global_init_backup_polling() {
65+
#ifndef GRPC_DO_NOT_INSTANTIATE_POSIX_POLLER
6566
// Disable backup polling if EventEngine is used everywhere.
6667
g_backup_polling_disabled = grpc_core::IsEventEngineClientEnabled() &&
6768
grpc_core::IsEventEngineListenerEnabled() &&
6869
grpc_core::IsEventEngineDnsEnabled();
70+
#else
71+
// EventEngine polling not supported, keep using the backup poller.
72+
g_backup_polling_disabled = false;
73+
#endif
6974
if (g_backup_polling_disabled) {
7075
return;
7176
}
@@ -155,11 +160,21 @@ static void g_poller_init_locked() {
155160
}
156161
}
157162

163+
static bool g_can_poll_in_background() {
164+
#ifndef GRPC_DO_NOT_INSTANTIATE_POSIX_POLLER
165+
return grpc_iomgr_run_in_background();
166+
#else
167+
// No iomgr "event_engines" (not to be confused with the new EventEngine)
168+
// are able to run in backgroung.
169+
return false;
170+
#endif
171+
}
172+
158173
void grpc_client_channel_start_backup_polling(
159174
grpc_pollset_set* interested_parties) {
160175
if (g_backup_polling_disabled ||
161176
g_poll_interval == grpc_core::Duration::Zero() ||
162-
grpc_iomgr_run_in_background()) {
177+
g_can_poll_in_background()) {
163178
return;
164179
}
165180
gpr_mu_lock(&g_poller_mu);
@@ -179,7 +194,7 @@ void grpc_client_channel_stop_backup_polling(
179194
grpc_pollset_set* interested_parties) {
180195
if (g_backup_polling_disabled ||
181196
g_poll_interval == grpc_core::Duration::Zero() ||
182-
grpc_iomgr_run_in_background()) {
197+
g_can_poll_in_background()) {
183198
return;
184199
}
185200
grpc_pollset_set_del_pollset(interested_parties, g_poller->pollset);

src/core/xds/grpc/xds_common_types_parser.cc

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -113,14 +113,6 @@ std::optional<grpc_resolved_address> ParseXdsAddress(
113113

114114
namespace {
115115

116-
bool XdsSystemRootCertsEnabled() {
117-
auto value = GetEnv("GRPC_EXPERIMENTAL_XDS_SYSTEM_ROOT_CERTS");
118-
if (!value.has_value()) return false;
119-
bool parsed_value;
120-
bool parse_succeeded = gpr_parse_bool_value(value->c_str(), &parsed_value);
121-
return parse_succeeded && parsed_value;
122-
}
123-
124116
// CertificateProviderInstance is deprecated but we are still supporting it for
125117
// backward compatibility reasons. Note that we still parse the data into the
126118
// same CertificateProviderPluginInstance struct since the fields are the same.
@@ -250,7 +242,7 @@ CertificateValidationContextParse(
250242
certificate_validation_context.ca_certs =
251243
CertificateProviderPluginInstanceParse(
252244
context, ca_certificate_provider_instance, errors);
253-
} else if (XdsSystemRootCertsEnabled()) {
245+
} else {
254246
auto* system_root_certs =
255247
envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_system_root_certs(
256248
certificate_validation_context_proto);

src/core/xds/grpc/xds_http_filter_registry.cc

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -90,9 +90,7 @@ XdsHttpFilterRegistry::XdsHttpFilterRegistry(bool register_builtins) {
9090
RegisterFilter(std::make_unique<XdsHttpFaultFilter>());
9191
RegisterFilter(std::make_unique<XdsHttpRbacFilter>());
9292
RegisterFilter(std::make_unique<XdsHttpStatefulSessionFilter>());
93-
if (XdsGcpAuthFilterEnabled()) {
94-
RegisterFilter(std::make_unique<XdsHttpGcpAuthnFilter>());
95-
}
93+
RegisterFilter(std::make_unique<XdsHttpGcpAuthnFilter>());
9694
}
9795
}
9896

0 commit comments

Comments
 (0)