Skip to content

Commit 3467a8a

Browse files
committed
Add patch for grpcio 1.66.1
1 parent acc45b3 commit 3467a8a

File tree

2 files changed

+39
-0
lines changed

2 files changed

+39
-0
lines changed
Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
diff --git a/setup.py b/setup.py
2+
index b936372..158056a 100644
3+
--- a/setup.py
4+
+++ b/setup.py
5+
@@ -133,7 +133,7 @@ BUILD_OVERRIDE_BORING_SSL_ASM_PLATFORM = os.environ.get(
6+
# to have been generated by building first *with* Cython support. Even if this
7+
# is set to false, if the script detects that the generated `.c` file isn't
8+
# present, then it will still attempt to use Cython.
9+
-BUILD_WITH_CYTHON = _env_bool_value("GRPC_PYTHON_BUILD_WITH_CYTHON", "False")
10+
+BUILD_WITH_CYTHON = _env_bool_value("GRPC_PYTHON_BUILD_WITH_CYTHON", "True")
11+
12+
# Export this variable to use the system installation of openssl. You need to
13+
# have the header files installed (in /usr/include/openssl) and during
14+
diff --git a/src/python/grpcio/grpc/_server.py b/src/python/grpcio/grpc/_server.py
15+
index c8af57c..ef862a2 100644
16+
--- a/src/python/grpcio/grpc/_server.py
17+
+++ b/src/python/grpcio/grpc/_server.py
18+
@@ -1257,13 +1257,13 @@ def _process_event_and_continue(
19+
state: _ServerState, event: cygrpc.BaseEvent
20+
) -> bool:
21+
should_continue = True
22+
- if event.tag is _SHUTDOWN_TAG:
23+
+ if event.tag == _SHUTDOWN_TAG:
24+
with state.lock:
25+
state.due.remove(_SHUTDOWN_TAG)
26+
if _stop_serving(state):
27+
should_continue = False
28+
elif (
29+
- event.tag is _REQUEST_CALL_TAG
30+
+ event.tag == _REQUEST_CALL_TAG
31+
or event.tag in state.registered_method_handlers.keys()
32+
):
33+
registered_method_name = None

graalpython/lib-graalpython/patches/metadata.toml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -144,6 +144,12 @@ version = '== 1.60.0'
144144
patch = 'grpcio-1.60.0.patch'
145145
license = 'Apache-2.0'
146146

147+
[[grpcio.rules]]
148+
# Force re-cythonize + other fixes
149+
version = '== 1.66.1'
150+
patch = 'grpcio-1.66.1.patch'
151+
license = 'Apache-2.0'
152+
147153
[[h2o.rules]]
148154
patch = 'h2o.patch'
149155
license = 'Apache-2.0'

0 commit comments

Comments
 (0)