diff --git a/0001-greenio-send-was-running-empty-loop-on-ENOTCONN.patch b/0001-greenio-send-was-running-empty-loop-on-ENOTCONN.patch new file mode 100644 index 0000000..817722e --- /dev/null +++ b/0001-greenio-send-was-running-empty-loop-on-ENOTCONN.patch @@ -0,0 +1,40 @@ +From ed0655333007fe97624b745e92deb407d192022c Mon Sep 17 00:00:00 2001 +From: Sergey Shepelev +Date: Fri, 15 May 2015 03:56:04 +0300 +Subject: [PATCH] greenio: send() was running empty loop on ENOTCONN; Thanks to + Seyeong Kim + +https://github.com/eventlet/eventlet/issues/192 + +cherry-picked-from: ed0655333007fe97624b745e92deb407d192022c +--- + AUTHORS | 1 + + eventlet/greenio/base.py | 3 ++- + 2 files changed, 3 insertions(+), 1 deletion(-) + +diff --git a/AUTHORS b/AUTHORS +index e0ab0e2..c57f010 100644 +--- a/AUTHORS ++++ b/AUTHORS +@@ -119,3 +119,4 @@ Thanks To + * Sean Dague, wsgi: Provide python logging compatibility + * Tim Simmons, Use _socket_nodns and select in dnspython support + * Antonio Cuni, fix fd double close on PyPy ++* Seyeong Kim +diff --git a/eventlet/greenio/base.py b/eventlet/greenio/base.py +index 8da51ca..1e43176 100644 +--- a/eventlet/greenio/base.py ++++ b/eventlet/greenio/base.py +@@ -358,7 +358,8 @@ class GreenSocket(object): + try: + total_sent += fd.send(data[total_sent:], flags) + except socket.error as e: +- if get_errno(e) not in SOCKET_BLOCKING: ++ eno = get_errno(e) ++ if eno == errno.ENOTCONN or eno not in SOCKET_BLOCKING: + raise + + if total_sent == len_data: +-- +2.1.0 + diff --git a/python-eventlet.spec b/python-eventlet.spec index 47f7c7d..398f116 100644 --- a/python-eventlet.spec +++ b/python-eventlet.spec @@ -12,11 +12,12 @@ Name: python-%{pypi_name} Version: 0.17.4 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Highly concurrent networking library License: MIT URL: http://eventlet.net Source0: http://pypi.python.org/packages/source/e/eventlet/eventlet-%{version}.tar.gz +Patch1: 0001-greenio-send-was-running-empty-loop-on-ENOTCONN.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -95,6 +96,7 @@ Documentation for the python-eventlet package. %prep %setup -q -n %{pypi_name}-%{version} rm -rf *.egg-info +%patch1 -p1 # generate html docs export PYTHONPATH="$( pwd ):$PYTHONPATH" @@ -162,6 +164,9 @@ rm -rf %{buildroot}/%{python_sitelib}/tests %endif %changelog +* Mon Oct 19 2015 Jon Schlueter 0.17.4-4 +- greenio: send() was running empty loop on ENOTCONN rhbz#1268351 + * Thu Sep 03 2015 Pádraig Brady - 0.17.4-3 - Tighten up Provides: and Obsoletes: for previous change