From cvs-return-34765-apmail-httpd-cvs-archive=httpd.apache.org@httpd.apache.org Mon Feb 01 15:21:43 2010 Return-Path: Delivered-To: apmail-httpd-cvs-archive@www.apache.org Received: (qmail 74286 invoked from network); 1 Feb 2010 15:21:43 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 1 Feb 2010 15:21:43 -0000 Received: (qmail 74708 invoked by uid 500); 1 Feb 2010 15:21:43 -0000 Delivered-To: apmail-httpd-cvs-archive@httpd.apache.org Received: (qmail 74616 invoked by uid 500); 1 Feb 2010 15:21:42 -0000 Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm Precedence: bulk Reply-To: dev@httpd.apache.org list-help: list-unsubscribe: List-Post: List-Id: Delivered-To: mailing list cvs@httpd.apache.org Received: (qmail 74607 invoked by uid 99); 1 Feb 2010 15:21:42 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 01 Feb 2010 15:21:42 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 01 Feb 2010 15:21:32 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 7282123889BB; Mon, 1 Feb 2010 15:21:11 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r905302 - in /httpd/mod_fcgid/trunk: CHANGES-FCGID modules/fcgid/fcgid_mutex_unix.c Date: Mon, 01 Feb 2010 15:21:11 -0000 To: cvs@httpd.apache.org From: trawick@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100201152111.7282123889BB@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: trawick Date: Mon Feb 1 15:21:00 2010 New Revision: 905302 URL: http://svn.apache.org/viewvc?rev=905302&view=rev Log: Resolve a regression in 2.3.5 with httpd 2.0.x on some Unix platforms; ownership of mutex files was incorrect, resulting in a startup failure. PR: 48651 Helped by: Modified: httpd/mod_fcgid/trunk/CHANGES-FCGID httpd/mod_fcgid/trunk/modules/fcgid/fcgid_mutex_unix.c Modified: httpd/mod_fcgid/trunk/CHANGES-FCGID URL: http://svn.apache.org/viewvc/httpd/mod_fcgid/trunk/CHANGES-FCGID?rev=905302&r1=905301&r2=905302&view=diff ============================================================================== --- httpd/mod_fcgid/trunk/CHANGES-FCGID [utf8] (original) +++ httpd/mod_fcgid/trunk/CHANGES-FCGID [utf8] Mon Feb 1 15:21:00 2010 @@ -1,6 +1,10 @@ -*- coding: utf-8 -*- Changes with mod_fcgid 2.3.6 + *) Resolve a regression in 2.3.5 with httpd 2.0.x on some Unix platforms; + ownership of mutex files was incorrect, resulting in a startup failure. + PR 48651. [Jeff Trawick, ] + *) Return 500 instead of segfaulting when the application returns no output. [Tatsuki Sugiura , Jeff Trawick] Modified: httpd/mod_fcgid/trunk/modules/fcgid/fcgid_mutex_unix.c URL: http://svn.apache.org/viewvc/httpd/mod_fcgid/trunk/modules/fcgid/fcgid_mutex_unix.c?rev=905302&r1=905301&r2=905302&view=diff ============================================================================== --- httpd/mod_fcgid/trunk/modules/fcgid/fcgid_mutex_unix.c (original) +++ httpd/mod_fcgid/trunk/modules/fcgid/fcgid_mutex_unix.c Mon Feb 1 15:21:00 2010 @@ -54,8 +54,16 @@ #else +/* no support for Mutex directive and related APIs */ + #include "ap_mpm.h" +#if MODULE_MAGIC_NUMBER_MAJOR < 20051115 +#ifndef AP_NEED_SET_MUTEX_PERMS +#define AP_NEED_SET_MUTEX_PERMS 1 +#endif +#endif + #if AP_NEED_SET_MUTEX_PERMS #include "unixd.h" #endif