Markéta Machová
6bc85bcc79
* Make gevent's queue classes subscriptable to match the standard
library. See issue #2102.
* Make the c-ares resolver build on Windows.
* The gevent testsuite runs a copy of the test_ssl from cpython but
the follwoing change has not been ported yet:
- gh-126500: test_ssl: Don't stop ThreadedEchoServer on OSError
in ConnectionHandler [gh#python/cpython/pull/126503]
- Rebase gevent-openssl35-test-fix.patch
- Upstream PR: [gh#gevent/gevent/pull/2103]
- Update to 25.4.1
* Remove some legacy code that supported Python 2 for compatibility
with the upcoming releases of Cython 3.1.
* Add a new environment variable and configuration setting to control
whether blocking reports are printed by the monitor thread.
* Add initial support for Python 3.14a7.
* Fix using gevent’s BackdoorServer with Unix sockets.
* Do not use pywsgi in a security-conscious environment. Fix one
security issue related to HTTP 100 Continue handling. See issue #2075.
OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-gevent?expand=0&rev=119
186 lines
7.2 KiB
Diff
186 lines
7.2 KiB
Diff
Index: gevent-25.4.2/src/greentest/3.11/test_ssl.py
|
|
===================================================================
|
|
--- gevent-25.4.2.orig/src/greentest/3.11/test_ssl.py
|
|
+++ gevent-25.4.2/src/greentest/3.11/test_ssl.py
|
|
@@ -2492,7 +2492,6 @@ class ThreadedEchoServer(threading.Threa
|
|
# See also http://erickt.github.io/blog/2014/11/19/adventures-in-debugging-a-potential-osx-kernel-bug/
|
|
if e.errno != errno.EPROTOTYPE and sys.platform != "darwin":
|
|
self.running = False
|
|
- self.server.stop()
|
|
self.close()
|
|
return False
|
|
else:
|
|
@@ -2627,10 +2626,6 @@ class ThreadedEchoServer(threading.Threa
|
|
self.close()
|
|
self.running = False
|
|
|
|
- # normally, we'd just stop here, but for the test
|
|
- # harness, we want to stop the server
|
|
- self.server.stop()
|
|
-
|
|
def __init__(self, certificate=None, ssl_version=None,
|
|
certreqs=None, cacerts=None,
|
|
chatty=True, connectionchatty=False, starttls_server=False,
|
|
@@ -2664,21 +2659,33 @@ class ThreadedEchoServer(threading.Threa
|
|
self.conn_errors = []
|
|
threading.Thread.__init__(self)
|
|
self.daemon = True
|
|
+ self._in_context = False
|
|
|
|
def __enter__(self):
|
|
+ if self._in_context:
|
|
+ raise ValueError('Re-entering ThreadedEchoServer context')
|
|
+ self._in_context = True
|
|
self.start(threading.Event())
|
|
self.flag.wait()
|
|
return self
|
|
|
|
def __exit__(self, *args):
|
|
+ assert self._in_context
|
|
+ self._in_context = False
|
|
self.stop()
|
|
self.join()
|
|
|
|
def start(self, flag=None):
|
|
+ if not self._in_context:
|
|
+ raise ValueError(
|
|
+ 'ThreadedEchoServer must be used as a context manager')
|
|
self.flag = flag
|
|
threading.Thread.start(self)
|
|
|
|
def run(self):
|
|
+ if not self._in_context:
|
|
+ raise ValueError(
|
|
+ 'ThreadedEchoServer must be used as a context manager')
|
|
self.sock.settimeout(1.0)
|
|
self.sock.listen(5)
|
|
self.active = True
|
|
Index: gevent-25.4.2/src/greentest/3.10/test_ssl.py
|
|
===================================================================
|
|
--- gevent-25.4.2.orig/src/greentest/3.10/test_ssl.py
|
|
+++ gevent-25.4.2/src/greentest/3.10/test_ssl.py
|
|
@@ -2485,7 +2485,6 @@ class ThreadedEchoServer(threading.Threa
|
|
# See also http://erickt.github.io/blog/2014/11/19/adventures-in-debugging-a-potential-osx-kernel-bug/
|
|
if e.errno != errno.EPROTOTYPE and sys.platform != "darwin":
|
|
self.running = False
|
|
- self.server.stop()
|
|
self.close()
|
|
return False
|
|
else:
|
|
@@ -2620,9 +2619,6 @@ class ThreadedEchoServer(threading.Threa
|
|
self.close()
|
|
self.running = False
|
|
|
|
- # normally, we'd just stop here, but for the test
|
|
- # harness, we want to stop the server
|
|
- self.server.stop()
|
|
|
|
def __init__(self, certificate=None, ssl_version=None,
|
|
certreqs=None, cacerts=None,
|
|
@@ -2657,21 +2653,33 @@ class ThreadedEchoServer(threading.Threa
|
|
self.conn_errors = []
|
|
threading.Thread.__init__(self)
|
|
self.daemon = True
|
|
+ self._in_context = False
|
|
|
|
def __enter__(self):
|
|
+ if self._in_context:
|
|
+ raise ValueError('Re-entering ThreadedEchoServer context')
|
|
+ self._in_context = True
|
|
self.start(threading.Event())
|
|
self.flag.wait()
|
|
return self
|
|
|
|
def __exit__(self, *args):
|
|
+ assert self._in_context
|
|
+ self._in_context = False
|
|
self.stop()
|
|
self.join()
|
|
|
|
def start(self, flag=None):
|
|
+ if not self._in_context:
|
|
+ raise ValueError(
|
|
+ 'ThreadedEchoServer must be used as a context manager')
|
|
self.flag = flag
|
|
threading.Thread.start(self)
|
|
|
|
def run(self):
|
|
+ if not self._in_context:
|
|
+ raise ValueError(
|
|
+ 'ThreadedEchoServer must be used as a context manager')
|
|
self.sock.settimeout(1.0)
|
|
self.sock.listen(5)
|
|
self.active = True
|
|
Index: gevent-25.4.2/src/greentest/3.12/test_ssl.py
|
|
===================================================================
|
|
--- gevent-25.4.2.orig/src/greentest/3.12/test_ssl.py
|
|
+++ gevent-25.4.2/src/greentest/3.12/test_ssl.py
|
|
@@ -2300,7 +2300,6 @@ class ThreadedEchoServer(threading.Threa
|
|
# See also http://erickt.github.io/blog/2014/11/19/adventures-in-debugging-a-potential-osx-kernel-bug/
|
|
if e.errno != errno.EPROTOTYPE and sys.platform != "darwin":
|
|
self.running = False
|
|
- self.server.stop()
|
|
self.close()
|
|
return False
|
|
else:
|
|
@@ -2435,10 +2434,6 @@ class ThreadedEchoServer(threading.Threa
|
|
self.close()
|
|
self.running = False
|
|
|
|
- # normally, we'd just stop here, but for the test
|
|
- # harness, we want to stop the server
|
|
- self.server.stop()
|
|
-
|
|
def __init__(self, certificate=None, ssl_version=None,
|
|
certreqs=None, cacerts=None,
|
|
chatty=True, connectionchatty=False, starttls_server=False,
|
|
@@ -2472,21 +2467,33 @@ class ThreadedEchoServer(threading.Threa
|
|
self.conn_errors = []
|
|
threading.Thread.__init__(self)
|
|
self.daemon = True
|
|
+ self._in_context = False
|
|
|
|
def __enter__(self):
|
|
+ if self._in_context:
|
|
+ raise ValueError('Re-entering ThreadedEchoServer context')
|
|
+ self._in_context = True
|
|
self.start(threading.Event())
|
|
self.flag.wait()
|
|
return self
|
|
|
|
def __exit__(self, *args):
|
|
+ assert self._in_context
|
|
+ self._in_context = False
|
|
self.stop()
|
|
self.join()
|
|
|
|
def start(self, flag=None):
|
|
+ if not self._in_context:
|
|
+ raise ValueError(
|
|
+ 'ThreadedEchoServer must be used as a context manager')
|
|
self.flag = flag
|
|
threading.Thread.start(self)
|
|
|
|
def run(self):
|
|
+ if not self._in_context:
|
|
+ raise ValueError(
|
|
+ 'ThreadedEchoServer must be used as a context manager')
|
|
self.sock.settimeout(1.0)
|
|
self.sock.listen(5)
|
|
self.active = True
|
|
Index: gevent-25.4.2/src/greentest/3.9/test_ssl.py
|
|
===================================================================
|
|
--- gevent-25.4.2.orig/src/greentest/3.9/test_ssl.py
|
|
+++ gevent-25.4.2/src/greentest/3.9/test_ssl.py
|
|
@@ -2559,10 +2559,6 @@ class ThreadedEchoServer(threading.Threa
|
|
self.close()
|
|
self.running = False
|
|
|
|
- # normally, we'd just stop here, but for the test
|
|
- # harness, we want to stop the server
|
|
- self.server.stop()
|
|
-
|
|
def __init__(self, certificate=None, ssl_version=None,
|
|
certreqs=None, cacerts=None,
|
|
chatty=True, connectionchatty=False, starttls_server=False,
|