]> git.pld-linux.org Git - packages/python3-gunicorn.git/commitdiff
- fix for eventlet 0.30+ changes from git auto/th/python3-gunicorn-20.1.0-1
authorJakub Bogusz <qboosh@pld-linux.org>
Thu, 24 Mar 2022 21:16:41 +0000 (22:16 +0100)
committerJakub Bogusz <qboosh@pld-linux.org>
Thu, 24 Mar 2022 21:16:41 +0000 (22:16 +0100)
gunicorn-eventlet0.30.patch [new file with mode: 0644]

diff --git a/gunicorn-eventlet0.30.patch b/gunicorn-eventlet0.30.patch
new file mode 100644 (file)
index 0000000..444dc47
--- /dev/null
@@ -0,0 +1,50 @@
+From 6a8ebb4844b2f28596ffe7421eb9f7d08c8dc4d8 Mon Sep 17 00:00:00 2001
+From: Sergey Shepelev <temotor@gmail.com>
+Date: Thu, 6 May 2021 12:54:06 +0300
+Subject: [PATCH] eventlet worker: ALREADY_HANDLED -> WSGI_LOCAL
+
+Eventlet v0.30.3+ removed wsgi.ALREADY_HANDLED in favor of
+`wsgi.WSGI_LOCAL.already_handled: bool`
+
+Sorry, this breaking change happened during only patch
+version increase 0.30.2 -> 0.30.3
+
+https://github.com/eventlet/eventlet/issues/543
+https://github.com/eventlet/eventlet/pull/544
+---
+ gunicorn/workers/geventlet.py | 11 ++++++++++-
+ 1 file changed, 10 insertions(+), 1 deletion(-)
+
+diff --git a/gunicorn/workers/geventlet.py b/gunicorn/workers/geventlet.py
+index ffdb206c0..ea82f3d62 100644
+--- a/gunicorn/workers/geventlet.py
++++ b/gunicorn/workers/geventlet.py
+@@ -17,11 +17,16 @@
+ from eventlet import hubs, greenthread
+ from eventlet.greenio import GreenSocket
+-from eventlet.wsgi import ALREADY_HANDLED as EVENTLET_ALREADY_HANDLED
++import eventlet.wsgi
+ import greenlet
+ from gunicorn.workers.base_async import AsyncWorker
++# ALREADY_HANDLED is removed in 0.30.3+ now it's `WSGI_LOCAL.already_handled: bool`
++# https://github.com/eventlet/eventlet/pull/544
++EVENTLET_WSGI_LOCAL = getattr(eventlet.wsgi, "WSGI_LOCAL", None)
++EVENTLET_ALREADY_HANDLED = getattr(eventlet.wsgi, "ALREADY_HANDLED", None)
++
+ def _eventlet_socket_sendfile(self, file, offset=0, count=None):
+     # Based on the implementation in gevent which in turn is slightly
+@@ -125,6 +130,10 @@ def patch(self):
+         patch_sendfile()
+     def is_already_handled(self, respiter):
++        # eventlet >= 0.30.3
++        if getattr(EVENTLET_WSGI_LOCAL, "already_handled", None):
++            raise StopIteration()
++        # eventlet < 0.30.3
+         if respiter == EVENTLET_ALREADY_HANDLED:
+             raise StopIteration()
+         return super().is_already_handled(respiter)
This page took 0.692908 seconds and 4 git commands to generate.