modify HOST_PORT_PAT in backport-fixed-issue-with-port-0-returning-None.patch

(cherry picked from commit a4d9944d9af5add44e4ec076d7665d4108c1d5f2)
This commit is contained in:
chenhaxing 2023-01-19 14:26:54 +08:00 committed by openeuler-sync-bot
parent e6e2c12487
commit 78935bce22
2 changed files with 10 additions and 4 deletions

View File

@ -21,7 +21,7 @@ index 6793de3..701ad75 100644
ZONE_ID_RE = re.compile("(" + ZONE_ID_PAT + r")\]$")
-_HOST_PORT_PAT = ("^(%s|%s|%s)(?::0*([0-9]{0,5}))?$") % (
+_HOST_PORT_PAT = ("^(%s|%s|%s)(?::0*?(|0|[1-9][0-9]{0,5}))?$") % (
+_HOST_PORT_PAT = ("^(%s|%s|%s)(?::0*?(|0|[1-9][0-9]{0,4}))?$") % (
REG_NAME_PAT,
IPV4_PAT,
IPV6_ADDRZ_PAT,
@ -44,4 +44,4 @@ index 165a331..c8729e8 100644
U = Url("http", host="google.com")
assert str(U) == U.url
--
2.27.0
2.27.0

View File

@ -3,7 +3,7 @@
Name: python-%{srcname}
Version: 1.25.9
Release: 6
Release: 7
Summary: Sanity-friendly HTTP client for Python
License: MIT
URL: https://urllib3.readthedocs.io
@ -119,11 +119,17 @@ PYTHONPATH=%{buildroot}%{python3_sitelib}:%{python3_sitelib} %{__python3} -m pyt
%{python3_sitelib}/urllib3-*.egg-info
%changelog
* Thu Jan 19 2023 chenhaixing <chenhaixing@huawei.com> - 1.25.9-7
- Type:bugfix
- CVE:NA
- SUG:NA
- DESC:modify HOST_PORT_PAT in backport-fixed-issue-with-port-0-returning-None.patch
* Mon Jan 16 2023 chenhaixing <chenhaixing@huawei.com> - 1.25.9-6
- Type:bugfix
- CVE:NA
- SUG:NA
- DESC:backport some patches
- DESC:fix parse port error and add server_hostname to SSL_KEYWORDS
* Thu Jan 5 2023 chenhaixing <chenhaixing@huawei.com> - 1.25.9-5
- Type:bugfix