From e4c38f072fba7a9e5ce569a12d30b58f1a13de3f Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Mar 31 2020 09:39:38 +0000 Subject: import python-urlgrabber-3.10-10.el7 --- diff --git a/SOURCES/BZ-1585596-support-http-connect-with-reget.patch b/SOURCES/BZ-1585596-support-http-connect-with-reget.patch new file mode 100644 index 0000000..a0c67d1 --- /dev/null +++ b/SOURCES/BZ-1585596-support-http-connect-with-reget.patch @@ -0,0 +1,12 @@ +diff -up urlgrabber-3.10/urlgrabber/grabber.py.orig urlgrabber-3.10/urlgrabber/grabber.py +--- urlgrabber-3.10/urlgrabber/grabber.py.orig 2019-08-23 23:05:08.724418881 +0200 ++++ urlgrabber-3.10/urlgrabber/grabber.py 2019-08-23 23:05:17.105535941 +0200 +@@ -1357,7 +1357,7 @@ class PyCurlFileObject(object): + if buf.lower().find('content-length:') != -1: + length = buf.split(':')[1] + self.size = int(length) +- elif self.append and self._hdr_dump == '' and ' 200 ' in buf: ++ elif self.append and self._hdr_dump == '' and ' 200 OK ' in buf: + # reget was attempted but server sends it all + # undo what we did in _build_range() + self.append = False diff --git a/SPECS/python-urlgrabber.spec b/SPECS/python-urlgrabber.spec index 1acf245..df62039 100644 --- a/SPECS/python-urlgrabber.spec +++ b/SPECS/python-urlgrabber.spec @@ -3,7 +3,7 @@ Summary: A high-level cross-protocol url-grabber Name: python-urlgrabber Version: 3.10 -Release: 9%{?dist} +Release: 10%{?dist} Source0: http://urlgrabber.baseurl.org/download/urlgrabber-%{version}.tar.gz Patch1: BZ-853432-single-conn-reset.patch Patch2: BZ-1017491-respond-to-ctrl-c.patch @@ -21,6 +21,9 @@ Patch25: BZ-1342179-add-retry-no-cache-opt.patch # rhel-7.6 Patch30: BZ-1204825-add-curl-object-opt.patch +# rhel-7.8 +Patch35: BZ-1585596-support-http-connect-with-reget.patch + License: LGPLv2+ Group: Development/Libraries BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root @@ -53,6 +56,9 @@ authentication, proxies and more. # rhel-7.6 %patch30 -p1 +# rhel-7.8 +%patch35 -p1 + %build python setup.py build @@ -72,6 +78,10 @@ rm -rf $RPM_BUILD_ROOT %attr(0755,root,root) %{_libexecdir}/urlgrabber-ext-down %changelog +* Fri Aug 23 2019 Michal Domonkos - 3.10-10 +- Support HTTP CONNECT method with reget. +- Resolves: bug#1585596 + * Fri May 25 2018 Michal Domonkos - 3.10-9 - Add curl_obj option. - Resolves: bug#1204825