# HG changeset patch
# User Petr Sumbera <petr.sumbera@oracle.com>
# Date 1391696530 28800
# Node ID 71cb13894b7c7bb1af0dacc3e4d0e524ce0e4c24
# Parent  4d2a1f9ca312a2a0f5671a56b0eec65c0b501be4
18129750 Upgrade mod_fcgid to version 2.3.9
18125128 problem in UTILITY/APACHE

diff -r 4d2a1f9ca312 -r 71cb13894b7c components/apache2-modules/mod_fcgid/Makefile
--- a/components/apache2-modules/mod_fcgid/Makefile	Wed Feb 05 12:35:42 2014 -0800
+++ b/components/apache2-modules/mod_fcgid/Makefile	Thu Feb 06 06:22:10 2014 -0800
@@ -18,17 +18,17 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
 #
 include ../../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		mod_fcgid
-COMPONENT_VERSION=	2.3.6
+COMPONENT_VERSION=	2.3.9
 COMPONENT_PROJECT_URL=	http://httpd.apache.org/mod_fcgid/
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
 COMPONENT_ARCHIVE_HASH=	\
-    sha256:e831795498d91cf27a519ea1332c2a92a2a9920b0844d817b2ea7f079056d12b
+    sha256:1cbad345e3376b5d7c8f9a62b471edd7fa892695b90b79502f326b4692a679cf
 COMPONENT_ARCHIVE_URL=	http://archive.apache.org/dist/httpd/mod_fcgid/$(COMPONENT_ARCHIVE)
 
 include ../../../make-rules/prep.mk
diff -r 4d2a1f9ca312 -r 71cb13894b7c components/apache2-modules/mod_fcgid/patches/fcgid.badspawnctl-r1037727.patch
--- a/components/apache2-modules/mod_fcgid/patches/fcgid.badspawnctl-r1037727.patch	Wed Feb 05 12:35:42 2014 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,17 +0,0 @@
-#
-#  Fix regression in 2.3.6 which broke process controls when using vhost-
-#  specific configuration.
-#
-Index: modules/fcgid/fcgid_spawn_ctl.c
-===================================================================
---- modules/fcgid/fcgid_spawn_ctl.c	(revision 1037726)
-+++ modules/fcgid/fcgid_spawn_ctl.c	(revision 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;