You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by tr...@apache.org on 2010/11/22 15:08:29 UTC
svn commit: r1037727 - in /httpd/mod_fcgid/trunk: CHANGES-FCGID
modules/fcgid/fcgid_spawn_ctl.c
Author: trawick
Date: Mon Nov 22 14:08:29 2010
New Revision: 1037727
URL: http://svn.apache.org/viewvc?rev=1037727&view=rev
Log:
Fix regression in 2.3.6 which broke process controls when using vhost-
specific configuration.
vhost_id was referenced from the wrong structure, and never matched
unless there were no vhost-specific directives in the vhost of the
request.
Modified:
httpd/mod_fcgid/trunk/CHANGES-FCGID
httpd/mod_fcgid/trunk/modules/fcgid/fcgid_spawn_ctl.c
Modified: httpd/mod_fcgid/trunk/CHANGES-FCGID
URL: http://svn.apache.org/viewvc/httpd/mod_fcgid/trunk/CHANGES-FCGID?rev=1037727&r1=1037726&r2=1037727&view=diff
==============================================================================
--- httpd/mod_fcgid/trunk/CHANGES-FCGID [utf8] (original)
+++ httpd/mod_fcgid/trunk/CHANGES-FCGID [utf8] Mon Nov 22 14:08:29 2010
@@ -1,6 +1,9 @@
-*- coding: utf-8 -*-
Changes with mod_fcgid 2.3.7
+ *) Fix regression in 2.3.6 which broke process controls when using vhost-
+ specific configuration. [Jeff Trawick]
+
*) Account for first process in class in the spawn score. [Jeff Trawick]
Changes with mod_fcgid 2.3.6
Modified: httpd/mod_fcgid/trunk/modules/fcgid/fcgid_spawn_ctl.c
URL: http://svn.apache.org/viewvc/httpd/mod_fcgid/trunk/modules/fcgid/fcgid_spawn_ctl.c?rev=1037727&r1=1037726&r2=1037727&view=diff
==============================================================================
--- httpd/mod_fcgid/trunk/modules/fcgid/fcgid_spawn_ctl.c (original)
+++ httpd/mod_fcgid/trunk/modules/fcgid/fcgid_spawn_ctl.c Mon Nov 22 14:08:29 2010
@@ -178,7 +178,7 @@ int is_spawn_allowed(server_rec * main_s
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;
Re: svn commit: r1037727 - in /httpd/mod_fcgid/trunk: CHANGES-FCGID modules/fcgid/fcgid_spawn_ctl.c
Posted by Jeff Trawick <tr...@gmail.com>.
On Mon, Nov 22, 2010 at 9:08 AM, <tr...@apache.org> wrote:
> Author: trawick
> Date: Mon Nov 22 14:08:29 2010
> New Revision: 1037727
>
> URL: http://svn.apache.org/viewvc?rev=1037727&view=rev
> Log:
> Fix regression in 2.3.6 which broke process controls when using vhost-
> specific configuration.
I'll post the patch today and also find some semi-automated way to
test the process management controls in the future :(