Fix Connections leaking in Mono.Webserver.FastCgi, bug #432750 by gentoo at pasichnyk dot net. Drop old.

(Portage version: 2.1.11.17/cvs/Linux x86_64)

3 files changed, 60 insertions, 10 deletions

diff --git a/dev-dotnet/xsp/ChangeLog b/dev-dotnet/xsp/ChangeLog
index 0e7ab9763cfd..8092cf7927c3 100644
--- a/dev-dotnet/xsp/ChangeLog
+++ b/dev-dotnet/xsp/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-dotnet/xsp
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/xsp/ChangeLog,v 1.106 2012/08/18 12:27:25 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/xsp/ChangeLog,v 1.107 2012/09/15 12:46:53 pacho Exp $
+
+*xsp-2.10.2-r2 (15 Sep 2012)
+
+  15 Sep 2012; Pacho Ramos <pacho@gentoo.org>
+  +files/xsp-2.10.2-endrequest.patch, +xsp-2.10.2-r2.ebuild, -xsp-2.10.2.ebuild:
+  Fix Connections leaking in Mono.Webserver.FastCgi, bug #432750 by gentoo at
+  pasichnyk dot net. Drop old.
 
   18 Aug 2012; Michael Weber <xmw@gentoo.org> xsp-2.10.2-r1.ebuild:
   ppc stable (bug 407701)
diff --git a/dev-dotnet/xsp/files/xsp-2.10.2-endrequest.patch b/dev-dotnet/xsp/files/xsp-2.10.2-endrequest.patch
new file mode 100644
index 000000000000..ff702d3faa59
--- /dev/null
+++ b/dev-dotnet/xsp/files/xsp-2.10.2-endrequest.patch
@@ -0,0 +1,35 @@
+From d2c4a279942a4575b80618719646d0767c077e96 Mon Sep 17 00:00:00 2001
+From: Guillaume Pitel <guillaume.pitel@exensa.com>
+Date: Tue, 6 Mar 2012 17:20:24 +0100
+Subject: [PATCH] Added try/catch around EndRequest Record sending (Bug 3765
+ https://bugzilla.xamarin.com/show_bug.cgi?id=3765)
+
+---
+ src/Mono.WebServer.FastCgi/Connection.cs |   11 +++++++----
+ 1 file changed, 7 insertions(+), 4 deletions(-)
+
+diff --git a/src/Mono.WebServer.FastCgi/Connection.cs b/src/Mono.WebServer.FastCgi/Connection.cs
+index 6c70824..0e9ef64 100644
+--- a/src/Mono.WebServer.FastCgi/Connection.cs
++++ b/src/Mono.WebServer.FastCgi/Connection.cs
+@@ -319,10 +319,13 @@ public void Run ()
+ 		{
+ 			EndRequestBody body = new EndRequestBody (appStatus,
+ 				protocolStatus);
+-			
+-			if (IsConnected)
+-				new Record (1, RecordType.EndRequest, requestID,
+-					    body.GetData ()).Send (socket);
++			try {	
++				if (IsConnected)
++					new Record (1, RecordType.EndRequest, requestID,
++						    body.GetData ()).Send (socket);
++			} catch (System.Net.Sockets.SocketException) {
++			}
++				
+ 			
+ 			int index = GetRequestIndex (requestID);
+ 			
+-- 
+1.7.10
+
diff --git a/dev-dotnet/xsp/xsp-2.10.2.ebuild b/dev-dotnet/xsp/xsp-2.10.2-r2.ebuild
index 31490eab3893..7990875b7e08 100644
--- a/dev-dotnet/xsp/xsp-2.10.2.ebuild
+++ b/dev-dotnet/xsp/xsp-2.10.2-r2.ebuild
@@ -1,10 +1,9 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/xsp/xsp-2.10.2.ebuild,v 1.5 2012/06/04 07:12:22 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/xsp/xsp-2.10.2-r2.ebuild,v 1.1 2012/09/15 12:46:53 pacho Exp $
 
-EAPI=2
-
-inherit go-mono mono user
+EAPI="4"
+inherit eutils go-mono mono user
 
 PATCHDIR="${FILESDIR}/2.2/"
 
@@ -13,7 +12,7 @@ HOMEPAGE="http://www.mono-project.com/ASP.NET"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ppc x86"
+KEYWORDS="~amd64 ~ppc ~x86"
 
 IUSE=""
 
@@ -22,6 +21,15 @@ DEPEND="${RDEPEND}"
 
 MAKEOPTS="${MAKEOPTS} -j1"
 
+src_prepare() {
+	# Added try/catch around EndRequest Record sending, bug #432750
+	epatch "${FILESDIR}/${PN}-2.10.2-endrequest.patch"
+}
+
+src_configure() {
+	default
+}
+
 pkg_preinst() {
 	enewgroup aspnet
 	# Give aspnet home dir of /tmp since it must create ~/.wapi
@@ -30,10 +38,10 @@ pkg_preinst() {
 
 src_install() {
 	mv_command="cp -ar" go-mono_src_install
-	newinitd "${PATCHDIR}"/xsp.initd xsp || die
-	newinitd "${PATCHDIR}"/mod-mono-server.initd mod-mono-server || die
-	newconfd "${PATCHDIR}"/xsp.confd xsp || die
-	newconfd "${PATCHDIR}"/mod-mono-server.confd mod-mono-server || die
+	newinitd "${PATCHDIR}"/xsp.initd xsp
+	newinitd "${PATCHDIR}"/mod-mono-server-r1.initd mod-mono-server
+	newconfd "${PATCHDIR}"/xsp.confd xsp
+	newconfd "${PATCHDIR}"/mod-mono-server.confd mod-mono-server
 
 	keepdir /var/run/aspnet
 }