dev-python/dulwich: fix possible hang with gzip

achieved by use of patch 'dulwich-0.12.0-fix-gzip-hang.patch', run in revbumped ebuild
Package-Manager: portage-2.2.28
Closes: https://github.com/gentoo/gentoo/pull/1247

Signed-off-by: Ian Delaney <idella4@gentoo.org>
This commit is contained in:
Louis Sautier
2016-04-12 16:36:57 +02:00
committed by Ian Delaney
parent c38e0ae6e5
commit b571300bec
2 changed files with 29 additions and 0 deletions

View File

@@ -21,6 +21,8 @@ DEPEND="
dev-python/setuptools[${PYTHON_USEDEP}]
test? ( dev-python/gevent[$(python_gen_usedep python2_7)] )"
RDEPEND=""
# https://github.com/jelmer/dulwich/pull/418
PATCHES=( "${FILESDIR}/${P}-fix-gzip-hang.patch" )
DISTUTILS_IN_SOURCE_BUILD=1

View File

@@ -0,0 +1,27 @@
From 6ba8bba4f41ca9a2a4f7568ad45cabd41d7c9964 Mon Sep 17 00:00:00 2001
From: Jonas Haag <jonas@lophus.org>
Date: Tue, 12 Apr 2016 15:40:38 +0200
Subject: [PATCH] Fix hang on Gzip decompression
'LimitedInputFilter' should be applied before the Gzip middleware as
'CONTENT_LENGTH' refers to the size of the *compressed* body. If
applied in wrong order, this may cause 'copyfileobj()' to try to read
more data from the socket than is available, resulting in a call to
'recv()' that hangs forever.
---
dulwich/web.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dulwich/web.py b/dulwich/web.py
index a4fa941..d8863fe 100644
--- a/dulwich/web.py
+++ b/dulwich/web.py
@@ -415,7 +415,7 @@ def make_wsgi_chain(*args, **kwargs):
correctly wrapped with needed middleware.
"""
app = HTTPGitApplication(*args, **kwargs)
- wrapped_app = GunzipFilter(LimitedInputFilter(app))
+ wrapped_app = LimitedInputFilter(GunzipFilter(app))
return wrapped_app