rpms/python-cherrypy/devel python-cherrypy-2.3.0-EINTR.patch, NONE, 1.1 python-cherrypy.spec, 1.16, 1.17

[Toshio くらとみ (toshio)]

Author: toshio

Update of /cvs/pkgs/rpms/python-cherrypy/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7223

Modified Files:
	python-cherrypy.spec 
Added Files:
	python-cherrypy-2.3.0-EINTR.patch 
Log Message:
* Thu Jan 17 2008 Toshio Kuratomi <toshio at fedoraproject.org> 2.3.0-2
- EINTR Patch needed to be forwarded ported as well as it is only applied to
  CP trunk (3.x).


python-cherrypy-2.3.0-EINTR.patch:

--- NEW FILE python-cherrypy-2.3.0-EINTR.patch ---
diff -up CherryPy-2.3.0/cherrypy/_cpwsgiserver.py.bak CherryPy-2.3.0/cherrypy/_cpwsgiserver.py
--- CherryPy-2.3.0/cherrypy/_cpwsgiserver.py.bak	2008-01-17 15:57:48.000000000 -0800
+++ CherryPy-2.3.0/cherrypy/_cpwsgiserver.py	2008-01-17 15:59:32.000000000 -0800
@@ -404,6 +404,13 @@ class CherryPyWSGIServer(object):
             # accept() by default
             return
         except socket.error, x:
+            if hasattr(errno, "EINTR") and x.args[0] == errno.EINTR:
+                # I *think* this is right. EINTR should occur when a signal
+                # is received during the accept() call; all docs say retry
+                # the call, and I *think* I'm reading it right that Python
+                # will then go ahead and poll for and handle the signal
+                # elsewhere. See http://www.cherrypy.org/ticket/707.
+                return
             msg = x.args[1]
             if msg == "Bad file descriptor":
                 # Our socket was closed


Index: python-cherrypy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-cherrypy/devel/python-cherrypy.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- python-cherrypy.spec	17 Jan 2008 23:17:17 -0000	1.16
+++ python-cherrypy.spec	18 Jan 2008 00:15:46 -0000	1.17
@@ -2,7 +2,7 @@
 
 Name:           python-cherrypy
 Version:        2.3.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A pythonic, object-oriented web development framework
 Group:          Development/Libraries
 License:        BSD
@@ -11,6 +11,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Patch0:         %{name}-tutorial-doc.patch
 Patch1:         %{name}-regression-test.patch
+Patch2:         %{name}-2.3.0-EINTR.patch
 
 BuildArch:      noarch
 
@@ -25,6 +26,7 @@
 %setup -q -n CherryPy-%{version}
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %{__sed} -i 's/\r//' CHANGELOG.txt README.txt CHERRYPYTEAM.txt cherrypy/tutorial/README.txt
 
@@ -49,8 +51,12 @@
 %{python_sitelib}/*
 
 %changelog
+* Thu Jan 17 2008 Toshio Kuratomi <toshio at fedoraproject.org> 2.3.0-2
+- EINTR Patch needed to be forwarded ported as well as it is only applied to
+  CP trunk (3.x).
+
 * Thu Jan 17 2008 Toshio Kuratomi <toshio at fedoraproject.org> 2.3.0-1
-- Update to new upstream which rolls in the backported fixes.
+- Update to new upstream which rolls in the backported security fix.
 - Refresh other patches to apply against new version.
 - Change to new canonical source URL.
 - Reenable tests.