diff --git a/python/python-requests/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch b/python/python-requests/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch index 799455f13..4139cedca 100644 --- a/python/python-requests/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch +++ b/python/python-requests/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch @@ -11,12 +11,12 @@ diff --git a/SPECS/python-requests.spec b/SPECS/python-requests.spec index efe0966..111bab7 100644 --- a/SPECS/python-requests.spec +++ b/SPECS/python-requests.spec -@@ -11,7 +11,7 @@ +@@ -13,7 +13,7 @@ Name: python-requests - Version: 2.14.2 --Release: 1%{?dist} -+Release: 1.el7%{?_tis_dist}.%{tis_patch_ver} + Version: 2.21.0 +-Release: 2%{?dist} ++Release: 2.el7%{?_tis_dist}.%{tis_patch_ver} Summary: HTTP library, written in Python, for human beings License: ASL 2.0 diff --git a/python/python-requests/centos/meta_patches/0002-include-patch-for-CGTS-2869.patch b/python/python-requests/centos/meta_patches/0002-include-patch-for-error-handling.patch similarity index 69% rename from python/python-requests/centos/meta_patches/0002-include-patch-for-CGTS-2869.patch rename to python/python-requests/centos/meta_patches/0002-include-patch-for-error-handling.patch index 66f213fcb..69b329877 100644 --- a/python/python-requests/centos/meta_patches/0002-include-patch-for-CGTS-2869.patch +++ b/python/python-requests/centos/meta_patches/0002-include-patch-for-error-handling.patch @@ -1,7 +1,7 @@ From b99292ef32fdde60d2ec4181ee5963b93a97cdf2 Mon Sep 17 00:00:00 2001 From: jmckenna Date: Wed, 13 Dec 2017 09:02:40 -0500 -Subject: [PATCH 2/2] include patch for CGTS-2869 +Subject: [PATCH 2/2] include patch for error handling --- SPECS/python-requests.spec | 2 ++ @@ -12,10 +12,10 @@ index 111bab7..8aab964 100644 --- a/SPECS/python-requests.spec +++ b/SPECS/python-requests.spec @@ -39,6 +39,8 @@ Patch2: python-requests-urllib3-at-%{urllib3_unbundled_version}.patch - # a pretty odd one so this is a niche requirement. - Patch3: requests-2.12.4-tests_nonet.patch - -+Patch4: 0001-CGTS-2869-close-connection-on-HTTP-413-Request-Entit.patch + # https://bugzilla.redhat.com/show_bug.cgi?id=1653223 + Patch5: requests-2.20.0-no-py2-httpbin.patch + ++Patch6: 0001-close-connection-on-HTTP-413-Request-Entit.patch + BuildArch: noarch diff --git a/python/python-requests/centos/meta_patches/PATCH_ORDER b/python/python-requests/centos/meta_patches/PATCH_ORDER index d19e7aa60..f0c013d87 100644 --- a/python/python-requests/centos/meta_patches/PATCH_ORDER +++ b/python/python-requests/centos/meta_patches/PATCH_ORDER @@ -1,2 +1,2 @@ 0001-Update-package-versioning-for-TIS-format.patch -0002-include-patch-for-CGTS-2869.patch +0002-include-patch-for-error-handling.patch diff --git a/python/python-requests/centos/patches/0001-CGTS-2869-close-connection-on-HTTP-413-Request-Entit.patch b/python/python-requests/centos/patches/0001-close-connection-on-HTTP-413-Request-Entit.patch similarity index 92% rename from python/python-requests/centos/patches/0001-CGTS-2869-close-connection-on-HTTP-413-Request-Entit.patch rename to python/python-requests/centos/patches/0001-close-connection-on-HTTP-413-Request-Entit.patch index 56b7653c8..5779d4be2 100644 --- a/python/python-requests/centos/patches/0001-CGTS-2869-close-connection-on-HTTP-413-Request-Entit.patch +++ b/python/python-requests/centos/patches/0001-close-connection-on-HTTP-413-Request-Entit.patch @@ -1,7 +1,7 @@ From 268a1f179e554027637bd2951b24ad44ecb4a1ee Mon Sep 17 00:00:00 2001 From: Daniel Badea Date: Wed, 7 Sep 2016 09:10:10 +0000 -Subject: [PATCH] CGTS-2869 close connection on HTTP 413 Request Entity Too +Subject: [PATCH] close connection on HTTP 413 Request Entity Too Large Allow low_conn to retrieve/handle unread response data buffers @@ -15,7 +15,7 @@ diff --git a/requests/adapters.py b/requests/adapters.py index fd46325..087258a 100644 --- a/requests/adapters.py +++ b/requests/adapters.py -@@ -455,12 +455,18 @@ class HTTPAdapter(BaseAdapter): +@@ -466,12 +466,18 @@ class HTTPAdapter(BaseAdapter): low_conn.endheaders() diff --git a/python/python-requests/centos/srpm_path b/python/python-requests/centos/srpm_path index f57236e1b..ebfbd310f 100644 --- a/python/python-requests/centos/srpm_path +++ b/python/python-requests/centos/srpm_path @@ -1 +1 @@ -mirror:Source/python-requests-2.14.2-1.el7.src.rpm +mirror:Source/python-requests-2.21.0-2.el7.src.rpm