From 5893884a6526b685a4dc1a4ed3594b8c8652f93a Mon Sep 17 00:00:00 2001
From: Paul Howarth <paul@city-fan.org>
Date: Sun, 22 Jan 2012 11:42:05 +0000
Subject: [PATCH] Fix for #783742

Fix regression in 2.3.6 that broke process controls when using vhost-specific
configuration (upstream issue 49902, #783742)
---
 mod_fcgid-2.3.6-bz783742.patch | 16 ++++++++++++++++
 mod_fcgid.spec                 | 11 ++++++++++-
 2 files changed, 26 insertions(+), 1 deletion(-)
 create mode 100644 mod_fcgid-2.3.6-bz783742.patch

diff --git a/mod_fcgid-2.3.6-bz783742.patch b/mod_fcgid-2.3.6-bz783742.patch
new file mode 100644
index 0000000..ee23631
--- /dev/null
+++ b/mod_fcgid-2.3.6-bz783742.patch
@@ -0,0 +1,16 @@
+This is an upstream patch for Apache Issue 49902, Fedora BZ#783742
+
+Fix regression in 2.3.6 which broke process controls when using vhost-
+specific configuration.
+
+--- httpd/mod_fcgid/trunk/modules/fcgid/fcgid_spawn_ctl.c	2010/11/22 14:08:25	1037726
++++ httpd/mod_fcgid/trunk/modules/fcgid/fcgid_spawn_ctl.c	2010/11/22 14:08:29	1037727
+@@ -178,7 +178,7 @@
+         if (current_node->inode == command->inode
+             && current_node->deviceid == command->deviceid
+             && !strcmp(current_node->cmdline, command->cmdline)
+-            && current_node->vhost_id == sconf->vhost_id
++            && current_node->vhost_id == command->vhost_id
+             && current_node->uid == command->uid
+             && current_node->gid == command->gid)
+             break;
diff --git a/mod_fcgid.spec b/mod_fcgid.spec
index 42fef50..bd96b25 100644
--- a/mod_fcgid.spec
+++ b/mod_fcgid.spec
@@ -16,7 +16,7 @@
 
 Name:		mod_fcgid
 Version:	2.3.6
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	FastCGI interface module for Apache 2
 Group:		System Environment/Daemons
 License:	ASL 2.0
@@ -30,6 +30,7 @@ Source10:	fastcgi.te
 Source11:	fastcgi-2.5.te
 Source12:	fastcgi.fc
 Patch0:		mod_fcgid-2.3.4-fixconf-shellbang.patch
+Patch1:		mod_fcgid-2.3.6-bz783742.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	httpd-devel >= 2.0, pkgconfig
 Requires:	httpd-mmn = %([ -a %{_includedir}/httpd/.mmn ] && %{__cat} %{_includedir}/httpd/.mmn || echo missing)
@@ -99,6 +100,10 @@ cp -p %{SOURCE12} fastcgi.fc
 # Fix shellbang in fixconf script for our location of sed
 %patch0 -p1
 
+# Fix regression in 2.3.6 that broke process controls when
+# using vhost-specific configuration (upstream fix)
+%patch1 -p3
+
 %build
 APXS=/usr/sbin/apxs ./configure.apxs
 make
@@ -188,6 +193,10 @@ exit 0
 %endif
 
 %changelog
+* Sun Jan 22 2012 Paul Howarth <paul@city-fan.org> 2.3.6-5
+- Fix regression in 2.3.6 that broke process controls when using vhost-specific
+  configuration (upstream issue 49902, #783742)
+
 * Fri Jan  6 2012 Paul Howarth <paul@city-fan.org> 2.3.6-4
 - Nobody else likes macros for commands