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 2009/12/10 20:42:55 UTC
svn commit: r889382 - in /httpd/mod_fcgid/trunk: CHANGES-FCGID
modules/fcgid/fcgid_conf.c
Author: trawick
Date: Thu Dec 10 19:42:55 2009
New Revision: 889382
URL: http://svn.apache.org/viewvc?rev=889382&view=rev
Log:
Respect DEFAULT_REL_RUNTIMEDIR for default values of FcgidIPCDir and
FcgidProcessTableFile.
Modified:
httpd/mod_fcgid/trunk/CHANGES-FCGID
httpd/mod_fcgid/trunk/modules/fcgid/fcgid_conf.c
Modified: httpd/mod_fcgid/trunk/CHANGES-FCGID
URL: http://svn.apache.org/viewvc/httpd/mod_fcgid/trunk/CHANGES-FCGID?rev=889382&r1=889381&r2=889382&view=diff
==============================================================================
--- httpd/mod_fcgid/trunk/CHANGES-FCGID [utf8] (original)
+++ httpd/mod_fcgid/trunk/CHANGES-FCGID [utf8] Thu Dec 10 19:42:55 2009
@@ -1,6 +1,9 @@
-*- coding: utf-8 -*-
Changes with mod_fcgid 2.3.5
+ *) Respect DEFAULT_REL_RUNTIMEDIR for default values of FcgidIPCDir and
+ FcgidProcessTableFile. [Jeff Trawick]
+
*) Resolve fatal EDEADLK errors with threaded MPMs on Solaris. [Jeff Trawick]
*) Display information about active processes in the server-status page.
Modified: httpd/mod_fcgid/trunk/modules/fcgid/fcgid_conf.c
URL: http://svn.apache.org/viewvc/httpd/mod_fcgid/trunk/modules/fcgid/fcgid_conf.c?rev=889382&r1=889381&r2=889382&view=diff
==============================================================================
--- httpd/mod_fcgid/trunk/modules/fcgid/fcgid_conf.c (original)
+++ httpd/mod_fcgid/trunk/modules/fcgid/fcgid_conf.c Thu Dec 10 19:42:55 2009
@@ -28,6 +28,10 @@
#include "fcgid_global.h"
#include "fcgid_conf.h"
+#ifndef DEFAULT_REL_RUNTIMEDIR /* Win32, etc. */
+#define DEFAULT_REL_RUNTIMEDIR "logs"
+#endif
+
#define DEFAULT_IDLE_TIMEOUT 300
#define DEFAULT_IDLE_SCAN_INTERVAL 120
#define DEFAULT_BUSY_TIMEOUT 300
@@ -35,8 +39,8 @@
#define DEFAULT_ERROR_SCAN_INTERVAL 3
#define DEFAULT_ZOMBIE_SCAN_INTERVAL 3
#define DEFAULT_PROC_LIFETIME (60*60)
-#define DEFAULT_SOCKET_PREFIX "logs/fcgidsock"
-#define DEFAULT_SHM_PATH "logs/fcgid_shm"
+#define DEFAULT_SOCKET_PREFIX DEFAULT_REL_RUNTIMEDIR "/fcgidsock"
+#define DEFAULT_SHM_PATH DEFAULT_REL_RUNTIMEDIR "/fcgid_shm"
#define DEFAULT_SPAWNSOCRE_UPLIMIT 10
#define DEFAULT_SPAWN_SCORE 1
#define DEFAULT_TERMINATION_SCORE 2