From fa7284a27f51b9f5d3eefb3487d18f275869ea39 Mon Sep 17 00:00:00 2001 From: Paul Howarth Date: Mon, 23 Apr 2012 12:34:22 +0100 Subject: [PATCH] Update to 2.3.7 - New upstream release 2.3.7 - Introduce FcgidWin32PreventOrphans directive on Windows to use OS Job Control Objects to terminate all running fcgi's when the worker process has been abruptly terminated (PR: 51078) - Periodically clean out the brigades that are pulling in the request body for handoff to the fcgid child (PR: 51749) - Resolve crash during graceful restarts (PR: 50309) - Solve latency/congestion of resolving effective user file access rights when no such info is desired, for config-related filename stats (PR: 51020) - Fix regression in 2.3.6 that broke process controls when using vhost-specific configuration - Account for first process in class in the spawn score - Drop patch for CVE-2012-1181, now included in upstream release --- .gitignore | 2 +- mod_fcgid-2.3.6-bz783742.patch | 16 ---------------- mod_fcgid.spec | 24 +++++++++++++++++------- sources | 2 +- 4 files changed, 19 insertions(+), 25 deletions(-) delete mode 100644 mod_fcgid-2.3.6-bz783742.patch diff --git a/.gitignore b/.gitignore index e665cfd..ddabfe1 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/mod_fcgid-2.3.6.tar.bz2 +/mod_fcgid-[0-9.]*.tar.bz2 diff --git a/mod_fcgid-2.3.6-bz783742.patch b/mod_fcgid-2.3.6-bz783742.patch deleted file mode 100644 index ee23631..0000000 --- a/mod_fcgid-2.3.6-bz783742.patch +++ /dev/null @@ -1,16 +0,0 @@ -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 7d1a381..a3753ab 100644 --- a/mod_fcgid.spec +++ b/mod_fcgid.spec @@ -30,8 +30,8 @@ %endif Name: mod_fcgid -Version: 2.3.6 -Release: 6%{?dist} +Version: 2.3.7 +Release: 1%{?dist} Summary: FastCGI interface module for Apache 2 Group: System Environment/Daemons License: ASL 2.0 @@ -46,7 +46,6 @@ 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 -nu) BuildRequires: httpd-devel >= 2.0, pkgconfig Requires: httpd-mmn = %{_httpd_mmn} @@ -117,10 +116,6 @@ 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=%{_httpd_apxs} ./configure.apxs make @@ -225,6 +220,21 @@ exit 0 %endif %changelog +* Mon Apr 23 2012 Paul Howarth 2.3.7-1 +- Update to 2.3.7 + - Introduce FcgidWin32PreventOrphans directive on Windows to use OS Job + Control Objects to terminate all running fcgi's when the worker process + has been abruptly terminated (PR: 51078) + - Periodically clean out the brigades that are pulling in the request body + for handoff to the fcgid child (PR: 51749) + - Resolve crash during graceful restarts (PR: 50309) + - Solve latency/congestion of resolving effective user file access rights + when no such info is desired, for config-related filename stats (PR: 51020) + - Fix regression in 2.3.6 that broke process controls when using + vhost-specific configuration + - Account for first process in class in the spawn score +- Drop patch for CVE-2012-1181, now included in upstream release + * Tue Mar 27 2012 Paul Howarth 2.3.6-6 - Fix compatibility with httpd 2.4 in F-18/RHEL-7 onwards - Use /run rather than /var/run from F-15/RHEL-7 onwards diff --git a/sources b/sources index 37d7d45..b7e10b5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -30ee138f3f0eb1c55303400748f128a2 mod_fcgid-2.3.6.tar.bz2 +5952c93dc16b42264a4bf2a54757fc08 mod_fcgid-2.3.7.tar.bz2