forked from pool/python-urllib3_1
Steve Kowalik
d598ec0258
* Fixed a crash where certain standard library hash functions were absent
in FIPS-compliant environments.
* Replaced deprecated dash-separated setuptools entries in setup.cfg.
* Backported changes to our tests and CI configuration from v2.x to
support testing with CPython 3.12 and 3.13.
* Added the Proxy-Authorization header to the list of headers to strip
from requests when redirecting to a different host. As before, different
headers can be set via Retry.remove_headers_on_redirect.
- Drop patch openssl-3.2.patch:
* No longer required.
OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-urllib3_1?expand=0&rev=23
35 lines
1.8 KiB
Diff
35 lines
1.8 KiB
Diff
Index: urllib3-1.26.18/changelog/3268.bugfix.rst
|
|
===================================================================
|
|
--- /dev/null
|
|
+++ urllib3-1.26.18/changelog/3268.bugfix.rst
|
|
@@ -0,0 +1 @@
|
|
+Fixed handling of OpenSSL 3.2.0 new error message for misconfiguring an HTTP proxy as HTTPS.
|
|
Index: urllib3-1.26.18/test/with_dummyserver/test_socketlevel.py
|
|
===================================================================
|
|
--- urllib3-1.26.18.orig/test/with_dummyserver/test_socketlevel.py
|
|
+++ urllib3-1.26.18/test/with_dummyserver/test_socketlevel.py
|
|
@@ -1226,7 +1226,8 @@ class TestSSL(SocketDummyServerTestCase)
|
|
self._start_server(socket_handler)
|
|
with HTTPSConnectionPool(self.host, self.port, ca_certs=DEFAULT_CA) as pool:
|
|
with pytest.raises(
|
|
- SSLError, match=r"(wrong version number|record overflow)"
|
|
+ SSLError,
|
|
+ match=r"(wrong version number|record overflow|record layer failure)",
|
|
):
|
|
pool.request("GET", "/", retries=False)
|
|
|
|
Index: urllib3-1.26.18/src/urllib3/connectionpool.py
|
|
===================================================================
|
|
--- urllib3-1.26.18.orig/src/urllib3/connectionpool.py
|
|
+++ urllib3-1.26.18/src/urllib3/connectionpool.py
|
|
@@ -768,7 +768,8 @@ class HTTPConnectionPool(ConnectionPool,
|
|
# so we try to cover our bases here!
|
|
message = " ".join(re.split("[^a-z]", str(ssl_error).lower()))
|
|
return (
|
|
- "wrong version number" in message or "unknown protocol" in message
|
|
+ "wrong version number" in message or "unknown protocol" in message or "record layer failure" in message
|
|
+
|
|
)
|
|
|
|
# Try to detect a common user error with proxies which is to
|