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/10/06 14:45:30 UTC
svn commit: r822252 - in /httpd/mod_fcgid/trunk: CHANGES-FCGID README-FCGID
docs/manual/mod/mod_fcgid.xml modules/fcgid/fcgid_conf.c
modules/fcgid/mod_fcgid.c tools/fixconf.sed
Author: trawick
Date: Tue Oct 6 12:45:29 2009
New Revision: 822252
URL: http://svn.apache.org/viewvc?rev=822252&view=rev
Log:
more adjustments to directive names:
FCGIDDefaultInitEnv -> FCGIDInitialEnv
FCGIDDefaultMaxClassProcessCount -> FCGIDMaxProcessesPerClass
FCGIDDefaultMinClassProcessCount -> FCGIDMinProcessesPerClass
FCGIDIPCCommTimeout -> FCGIDIOTimeout
FCGIDIPCConnectTimeout -> FCGIDConnectTimeout
FCGIDMaxProcessCount -> FCGIDMaxProcesses
FCGIDPHPFixPathinfoEnable -> FCGIDFixPathinfo
FCGIDSharememPath -> FCGIDProcessTableFile
FCGIDSocketPath -> FCGIDIPCDir
as 2.3.2 was never released, update 2.3.2 change entries as appropriate to avoid
creating a trail to follow to see what changed from mod_fcgid 2.2
Modified:
httpd/mod_fcgid/trunk/CHANGES-FCGID
httpd/mod_fcgid/trunk/README-FCGID
httpd/mod_fcgid/trunk/docs/manual/mod/mod_fcgid.xml
httpd/mod_fcgid/trunk/modules/fcgid/fcgid_conf.c
httpd/mod_fcgid/trunk/modules/fcgid/mod_fcgid.c
httpd/mod_fcgid/trunk/tools/fixconf.sed
Modified: httpd/mod_fcgid/trunk/CHANGES-FCGID
URL: http://svn.apache.org/viewvc/httpd/mod_fcgid/trunk/CHANGES-FCGID?rev=822252&r1=822251&r2=822252&view=diff
==============================================================================
--- httpd/mod_fcgid/trunk/CHANGES-FCGID [utf8] (original)
+++ httpd/mod_fcgid/trunk/CHANGES-FCGID [utf8] Tue Oct 6 12:45:29 2009
@@ -4,9 +4,8 @@
*) Add FCGIDCmdOptions directive. [Jeff Trawick]
*) Allow/respect virtual host settings for the following directives:
- FCGIDBusyTimeout, FCGIDDefaultMaxClassProcessCount,
- FCGIDDefaultMinClassProcessCount, FCGIDIdleTimeout, and
- FCGIDProcessLifetime. [Jeff Trawick]
+ FCGIDBusyTimeout, FCGIDMaxProcessesPerClass, FCGIDMinProcessesPerClass,
+ FCGIDIdleTimeout, and FCGIDProcessLifetime. [Jeff Trawick]
Changes with mod_fcgid 2.3.2
@@ -39,9 +38,9 @@
...................................................................
BusyScanInterval FCGIDBusyScanInterval
BusyTimeout FCGIDBusyTimeout
- DefaultInitEnv FCGIDDefaultInitEnv
- DefaultMaxClassProcessCount FCGIDDefaultMaxClassProcessCount
- DefaultMinClassProcessCount FCGIDDefaultMinClassProcessCount
+ DefaultInitEnv FCGIDInitialEnv
+ DefaultMaxClassProcessCount FCGIDMaxProcessesPerClass
+ DefaultMinClassProcessCount FCGIDMinProcessesPerClass
ErrorScanInterval FCGIDErrorScanInterval
FastCgiAccessChecker FCGIDAccessChecker
FastCgiAccessCheckerAuthoritative FCGIDAccessCheckerAuthoritative
@@ -52,18 +51,18 @@
FCGIWrapper FCGIDWrapper
IdleScanInterval FCGIDIdleScanInterval
IdleTimeout FCGIDIdleTimeout
- IPCCommTimeout FCGIDIPCCommTimeout
- IPCConnectTimeout FCGIDIPCConnectTimeout
- MaxProcessCount FCGIDMaxProcessCount
+ IPCCommTimeout FCGIDIOTimeout
+ IPCConnectTimeout FCGIDConnectTimeout
+ MaxProcessCount FCGIDMaxProcesses
MaxRequestInMem FCGIDMaxRequestInMem
MaxRequestLen FCGIDMaxRequestLen
MaxRequestsPerProcess FCGIDMaxRequestsPerProcess
OutputBufferSize FCGIDOutputBufferSize
PassHeader FCGIDPassHeader
- PHP_Fix_Pathinfo_Enable FCGIDPHPFixPathinfoEnable
+ PHP_Fix_Pathinfo_Enable FCGIDFixPathinfo
ProcessLifeTime FCGIDProcessLifeTime
- SharememPath FCGIDSharememPath
- SocketPath FCGIDSocketPath
+ SharememPath FCGIDProcessTableFile
+ SocketPath FCGIDIPCDir
SpawnScore FCGIDSpawnScore
SpawnScoreUpLimit FCGIDSpawnScoreUpLimit
TerminationScore FCGIDTerminationScore
@@ -79,22 +78,22 @@
*) Merge mod_fcgid server config/virtual host directives so that they can
be inherited or overridden within a virtual host as expected. Affected
- directives: FCGIDIPCCommTimeout, FCGIDIPCConnectTimeout,
+ directives: FCGIDIOTimeout, FCGIDConnectTimeout,
FCGIDMaxRequestInMem, FCGIDMaxRequestLen, FCGIDMaxRequestsPerProcess,
FCGIDOutputBufferSize. [Jeff Trawick]
*) Use the virtual host settings for the request being processed instead
of those of the first FastCGI request handled by this httpd child process.
- Affected directives: FCGIDBusyTimeout, FCGIDIPCCommTimeout,
- FCGIDIPCConnectTimeout, FCGIDMaxRequestsPerProcess, and FCGIDOutputBufferSize.
+ Affected directives: FCGIDBusyTimeout, FCGIDIOTimeout,
+ FCGIDConnectTimeout, FCGIDMaxRequestsPerProcess, and FCGIDOutputBufferSize.
[Jeff Trawick]
*) The following directives are no longer allowed in a virtual host
context: FCGIDBusyScanInterval, FCGIDBusyTimeout,
- FCGIDDefaultMaxClassProcessCount, FCGIDDefaultMinProcessCount,
+ FCGIDMaxProcessesPerClass, FCGIDDefaultMinProcessCount,
FCGIDErrorScanInterval, FCGIDIdleScanInterval, FCGIDIdleTimeout,
- FCGIDMaxProcessCount, FCGIDPHPFixPathinfo_Enable, FCGIDProcessLifetime,
- FCGIDSharememPath, FCGIDSocketPath, FCGIDSpawnScore,
+ FCGIDMaxProcesses, FCGIDFixPathinfo, FCGIDProcessLifetime,
+ FCGIDProcessTableFile, FCGIDIPCDir, FCGIDSpawnScore,
FCGIDSpawnScoreUpLimit, FCGIDTerminationScore, FCGIDTimeScore, and
FCGIDZombieScanInterval. They were allowed but ignored in previous
releases. [Jeff Trawick]
Modified: httpd/mod_fcgid/trunk/README-FCGID
URL: http://svn.apache.org/viewvc/httpd/mod_fcgid/trunk/README-FCGID?rev=822252&r1=822251&r2=822252&view=diff
==============================================================================
--- httpd/mod_fcgid/trunk/README-FCGID (original)
+++ httpd/mod_fcgid/trunk/README-FCGID Tue Oct 6 12:45:29 2009
@@ -145,7 +145,7 @@
ii. Some directives which could be placed inside <VirtualHost > but were
ignored before now result in configuration errors. As before, these
directives must be set at global scope to have the desired effect.
- These include FCGIDMaxProcessCount, FCGIDPHPFixPathinfoEnable, and
+ These include FCGIDMaxProcesses, FCGIDFixPathinfo, and
others. (Consult CHANGES-FCGID for the complete list.)
iii. Some directives which could be placed inside <VirtualHost > but were
@@ -156,7 +156,7 @@
iv. Some directives which can optionally be placed inside <VirtualHost >
were not inherited as expected in older releases. This has been
corrected, and behavior will change for some configurations. Affected
- directives include FCGIDIPCCommTimeout, FCGIDOutputBufferSize, and others.
+ directives include FCGIDIOTimeout, FCGIDOutputBufferSize, and others.
(Consult CHANGES-FCGID for the complete list.)
v. Some directives which can be placed inside <Directory >, <Location >,
Modified: httpd/mod_fcgid/trunk/docs/manual/mod/mod_fcgid.xml
URL: http://svn.apache.org/viewvc/httpd/mod_fcgid/trunk/docs/manual/mod/mod_fcgid.xml?rev=822252&r1=822251&r2=822252&view=diff
==============================================================================
--- httpd/mod_fcgid/trunk/docs/manual/mod/mod_fcgid.xml (original)
+++ httpd/mod_fcgid/trunk/docs/manual/mod/mod_fcgid.xml Tue Oct 6 12:45:29 2009
@@ -82,15 +82,15 @@
</tr>
<tr>
<td><directive>DefaultInitEnv</directive></td>
- <td><directive module="mod_fcgid">FCGIDDefaultInitEnv</directive></td>
+ <td><directive module="mod_fcgid">FCGIDInitialEnv</directive></td>
</tr>
<tr>
<td><directive>DefaultMaxClassProcessCount</directive></td>
- <td><directive module="mod_fcgid">FCGIDDefaultMaxClassProcessCount</directive></td>
+ <td><directive module="mod_fcgid">FCGIDMaxProcessesPerClass</directive></td>
</tr>
<tr>
<td><directive>DefaultMinClassProcessCount</directive></td>
- <td><directive module="mod_fcgid">FCGIDDefaultMinClassProcessCount</directive></td>
+ <td><directive module="mod_fcgid">FCGIDMinProcessesPerClass</directive></td>
</tr>
<tr>
<td><directive>ErrorScanInterval</directive></td>
@@ -134,15 +134,15 @@
</tr>
<tr>
<td><directive>IPCCommTimeout</directive></td>
- <td><directive module="mod_fcgid">FCGIDIPCCommTimeout</directive></td>
+ <td><directive module="mod_fcgid">FCGIDIOTimeout</directive></td>
</tr>
<tr>
<td><directive>IPCConnectTimeout</directive></td>
- <td><directive module="mod_fcgid">FCGIDIPCConnectTimeout</directive></td>
+ <td><directive module="mod_fcgid">FCGIDConnectTimeout</directive></td>
</tr>
<tr>
<td><directive>MaxProcessCount</directive></td>
- <td><directive module="mod_fcgid">FCGIDMaxProcessCount</directive></td>
+ <td><directive module="mod_fcgid">FCGIDMaxProcesses</directive></td>
</tr>
<tr>
<td><directive>MaxRequestInMem</directive></td>
@@ -166,7 +166,7 @@
</tr>
<tr>
<td><directive>PHP_Fix_Pathinfo_Enable</directive></td>
- <td><directive module="mod_fcgid">FCGIDPHPFixPathinfoEnable</directive></td>
+ <td><directive module="mod_fcgid">FCGIDFixPathinfo</directive></td>
</tr>
<tr>
<td><directive>ProcessLifeTime</directive></td>
@@ -174,11 +174,11 @@
</tr>
<tr>
<td><directive>SharememPath</directive></td>
- <td><directive module="mod_fcgid">FCGIDSharememPath</directive></td>
+ <td><directive module="mod_fcgid">FCGIDProcessTableFile</directive></td>
</tr>
<tr>
<td><directive>SocketPath</directive></td>
- <td><directive module="mod_fcgid">FCGIDSocketPath</directive></td>
+ <td><directive module="mod_fcgid">FCGIDIPCDir</directive></td>
</tr>
<tr>
<td><directive>SpawnScore</directive></td>
@@ -266,7 +266,7 @@
an appropriate place to define any environment variables required
by the application, such as <code>PHP_FCGI_MAX_REQUESTS</code>
or anything else. (Environment variables can also be set with
- <directive module="mod_fcgid">FCGIDDefaultInitEnv</directive>,
+ <directive module="mod_fcgid">FCGIDInitialEnv</directive>,
but they then apply to all applications.)</p>
<p>Here is an example that uses a wrapper script to invoke PHP:</p>
@@ -291,7 +291,7 @@
FCGIDWrapper /usr/local/bin/php-wrapper .php<br />
# Uncomment the following line if cgi.fix_pathinfo<br />
# is set to 1 in php.ini:<br />
- # FCGIDPHPFixPathinfoEnable 1<br />
+ # FCGIDFixPathinfo 1<br />
<br />
# Customize the next two directives for your requirements.<br />
Order allow,deny<br />
@@ -357,7 +357,7 @@
<tr><th>Type of control</th><th>Directive</th></tr>
<tr>
<td>global limit on number of processes</td>
- <td><directive module="mod_fcgid">FCGIDMaxProcessCount</directive></td>
+ <td><directive module="mod_fcgid">FCGIDMaxProcesses</directive></td>
</tr>
<tr>
<td>limit on number of processes per application</td>
@@ -391,14 +391,14 @@
<note type="hint"><title>Note</title>
<p>Certain settings or other concepts that depend on the virtual host,
- such as <directive module="mod_fcgid">FCGIDDefaultInitEnv</directive>
+ such as <directive module="mod_fcgid">FCGIDInitialEnv</directive>
or process classes, distinguish between virtual hosts only if they
have distinct server names. (See the <directive>ServerName</directive>
documentation for more information.) In the case of
- <directive module="mod_fcgid">FCGIDDefaultInitEnv</directive>, if two
+ <directive module="mod_fcgid">FCGIDInitialEnv</directive>, if two
virtual hosts have the same server name but different environments as
defined by
- <directive module="mod_fcgid">FCGIDDefaultInitEnv</directive>, the
+ <directive module="mod_fcgid">FCGIDInitialEnv</directive>, the
environment used for a particular request will be that defined for the
virtual host of the request that caused the FastCGI process to be
started.</p>
@@ -630,7 +630,7 @@
<tr><th>Option name and syntax</th><th>Corresponding directive</th></tr>
<tr>
<td><code>ConnectTimeout <em>seconds</em></code></td>
- <td><directive module="mod_fcgid">FCGIDIPCConnectTimeout</directive></td>
+ <td><directive module="mod_fcgid">FCGIDConnectTimeout</directive></td>
</tr>
<tr>
<td><code>IdleTimeout <em>seconds</em></code></td>
@@ -638,15 +638,15 @@
</tr>
<tr>
<td><code>InitialEnv <em>name[=value]</em></code></td>
- <td><directive module="mod_fcgid">FCGIDDefaultInitEnv</directive></td>
+ <td><directive module="mod_fcgid">FCGIDInitialEnv</directive></td>
</tr>
<tr>
<td><code>IOTimeout <em>seconds</em></code></td>
- <td><directive module="mod_fcgid">FCGIDIPCCommTimeout</directive></td>
+ <td><directive module="mod_fcgid">FCGIDIOTimeout</directive></td>
</tr>
<tr>
<td><code>MaxProcesses <em>value</em></code></td>
- <td><directive module="mod_fcgid">FCGIDDefaultMaxClassProcessCount</directive></td>
+ <td><directive module="mod_fcgid">FCGIDMaxProcessesPerClass</directive></td>
</tr>
<tr>
<td><code>MaxProcessLifeTime <em>seconds</em></code></td>
@@ -658,7 +658,7 @@
</tr>
<tr>
<td><code>MinProcesses <em>value</em></code></td>
- <td><directive module="mod_fcgid">FCGIDDefaultMinClassProcessCount</directive></td>
+ <td><directive module="mod_fcgid">FCGIDMinProcessesPerClass</directive></td>
</tr>
</table>
@@ -688,23 +688,23 @@
</directivesynopsis>
<directivesynopsis>
- <name>FCGIDDefaultInitEnv</name>
+ <name>FCGIDInitialEnv</name>
<description>an environment variable name and optional value to pass to FastCGI.</description>
- <syntax>FCGIDDefaultInitEnv <em>name</em> [ <em>value</em> ]</syntax>
+ <syntax>FCGIDInitialEnv <em>name</em> [ <em>value</em> ]</syntax>
<default><em>none</em></default>
<contextlist><context>server config</context> <context>virtual host</context></contextlist>
<usage>
- <p>Use <directive>FCGIDDefaultInitEnv</directive> to define environment
+ <p>Use <directive>FCGIDInitialEnv</directive> to define environment
variables to pass to the FastCGI application. This directive can
be used multiple times.</p>
</usage>
</directivesynopsis>
<directivesynopsis>
- <name>FCGIDDefaultMaxClassProcessCount</name>
+ <name>FCGIDMaxProcessesPerClass</name>
<description>Max process count of one class of FastCGI application</description>
- <syntax>FCGIDDefaultMaxClassProcessCount <em>value</em></syntax>
- <default>FCGIDDefaultMaxClassProcessCount 100</default>
+ <syntax>FCGIDMaxProcessesPerClass <em>value</em></syntax>
+ <default>FCGIDMaxProcessesPerClass 100</default>
<contextlist><context>server config</context> <context>virtual host</context></contextlist>
<usage>
<p>A process class is the set of processes which were started by the same
@@ -717,10 +717,10 @@
</directivesynopsis>
<directivesynopsis>
- <name>FCGIDDefaultMinClassProcessCount</name>
+ <name>FCGIDMinProcessesPerClass</name>
<description>Min process count of one class of FastCGI application</description>
- <syntax>FCGIDDefaultMinClassProcessCount <em>value</em></syntax>
- <default>FCGIDDefaultMinClassProcessCount 3</default>
+ <syntax>FCGIDMinProcessesPerClass <em>value</em></syntax>
+ <default>FCGIDMinProcessesPerClass 3</default>
<contextlist><context>server config</context> <context>virtual host</context></contextlist>
<usage>
<p>A process class is the set of processes which were started by the same
@@ -771,16 +771,16 @@
<p>Application processes which have not handled a request for this
period of time will be terminated, if the number of processses for the
class exceeds
- <directive module="mod_fcgid">FCGIDDefaultMinClassProcessCount</directive>.
+ <directive module="mod_fcgid">FCGIDMinProcessesPerClass</directive>.
A value of <code>0</code> disables the check.</p>
</usage>
</directivesynopsis>
<directivesynopsis>
- <name>FCGIDIPCCommTimeout</name>
+ <name>FCGIDIOTimeout</name>
<description>Communication timeout to FastCGI server</description>
- <syntax>FCGIDIPCCommTimeout <em>seconds</em></syntax>
- <default>FCGIDIPCCommTimeout 40</default>
+ <syntax>FCGIDIOTimeout <em>seconds</em></syntax>
+ <default>FCGIDIOTimeout 40</default>
<contextlist><context>server config</context> <context>virtual host</context></contextlist>
<usage>
<p>This is the maximum period of time the module will wait
@@ -795,10 +795,10 @@
</directivesynopsis>
<directivesynopsis>
- <name>FCGIDIPCConnectTimeout</name>
+ <name>FCGIDConnectTimeout</name>
<description>Connect timeout to FastCGI server</description>
- <syntax>FCGIDIPCConnectTimeout <em>seconds</em></syntax>
- <default>FCGIDIPCConnectTimeout 3</default>
+ <syntax>FCGIDConnectTimeout <em>seconds</em></syntax>
+ <default>FCGIDConnectTimeout 3</default>
<contextlist><context>server config</context> <context>virtual host</context></contextlist>
<usage>
<p>This is the maximum period of time the module will wait
@@ -809,10 +809,10 @@
</directivesynopsis>
<directivesynopsis>
- <name>FCGIDMaxProcessCount</name>
+ <name>FCGIDMaxProcesses</name>
<description>maximum number of FastCGI application processes</description>
- <syntax>FCGIDMaxProcessCount <em>value</em></syntax>
- <default>FCGIDMaxProcessCount 1000</default>
+ <syntax>FCGIDMaxProcesses <em>value</em></syntax>
+ <default>FCGIDMaxProcesses 1000</default>
<contextlist><context>server config</context></contextlist>
<usage>
<p>This directive sets the maximum number of FastCGI application
@@ -917,16 +917,16 @@
</directivesynopsis>
<directivesynopsis>
- <name>FCGIDPHPFixPathinfoEnable</name>
+ <name>FCGIDFixPathinfo</name>
<description>Mirror the PHP <code>cgi.fix_pathinfo</code>
setting</description>
- <syntax>FCGIDPHPFixPathinfoEnable 1</syntax>
- <default>FCGIDPHPFixPathinfoEnable 0</default>
+ <syntax>FCGIDFixPathinfo 1</syntax>
+ <default>FCGIDFixPathinfo 0</default>
<contextlist><context>server config</context></contextlist>
<usage>
<p>This directive enables special <code>SCRIPT_NAME</code>
processing which allows PHP to provide additional path information.
- The setting of <directive>FCGIDPHPFixPathinfoEnable</directive>
+ The setting of <directive>FCGIDFixPathinfo</directive>
should mirror the <code>cgi.fix_pathinfo</code> setting in
<code>php.ini</code>.</p>
</usage>
@@ -942,16 +942,16 @@
<p>Idle application processes which have existed for greater
than this time will be terminated, if the number of processses for the
class exceeds
- <directive module="mod_fcgid">FCGIDDefaultMinClassProcessCount</directive>.
+ <directive module="mod_fcgid">FCGIDMinProcessesPerClass</directive>.
A value of <code>0</code> disables the check.</p>
</usage>
</directivesynopsis>
<directivesynopsis>
- <name>FCGIDSharememPath</name>
+ <name>FCGIDProcessTableFile</name>
<description>shared memory file path</description>
- <syntax>FCGIDSharememPath <em>pathname</em></syntax>
- <default>FCGIDSharememPath logs/fcgid_shm</default>
+ <syntax>FCGIDProcessTableFile <em>pathname</em></syntax>
+ <default>FCGIDProcessTableFile logs/fcgid_shm</default>
<contextlist><context>server config</context></contextlist>
<usage>
<p>This module uses shared memory on Unix to maintain state which
@@ -961,10 +961,10 @@
</directivesynopsis>
<directivesynopsis>
- <name>FCGIDSocketPath</name>
+ <name>FCGIDIPCDir</name>
<description>directory for AF_UNIX sockets (Unix) or pipes (Windows)</description>
- <syntax>FCGIDSocketPath <em>pathname</em></syntax>
- <default>FCGIDSocketPath logs/fcgidsock</default>
+ <syntax>FCGIDIPCDir <em>pathname</em></syntax>
+ <default>FCGIDIPCDir logs/fcgidsock</default>
<contextlist><context>server config</context></contextlist>
<usage>
<p>This module uses AF_UNIX sockets or named pipes, depending on the
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=822252&r1=822251&r2=822252&view=diff
==============================================================================
--- httpd/mod_fcgid/trunk/modules/fcgid/fcgid_conf.c (original)
+++ httpd/mod_fcgid/trunk/modules/fcgid/fcgid_conf.c Tue Oct 6 12:45:29 2009
@@ -536,7 +536,7 @@
ap_get_module_config(s->module_config, &fcgid_module);
config->ipc_comm_timeout = atol(arg);
if (config->ipc_comm_timeout <= 0) {
- return "IPCCommTimeout must be greater than 0";
+ return "FCGIDIOTimeout must be greater than 0";
}
config->ipc_comm_timeout_set = 1;
return NULL;
Modified: httpd/mod_fcgid/trunk/modules/fcgid/mod_fcgid.c
URL: http://svn.apache.org/viewvc/httpd/mod_fcgid/trunk/modules/fcgid/mod_fcgid.c?rev=822252&r1=822251&r2=822252&view=diff
==============================================================================
--- httpd/mod_fcgid/trunk/modules/fcgid/mod_fcgid.c (original)
+++ httpd/mod_fcgid/trunk/modules/fcgid/mod_fcgid.c Tue Oct 6 12:45:29 2009
@@ -620,13 +620,13 @@
"a fastcgi application will be killed after handling a request for BusyTimeout"),
AP_INIT_RAW_ARGS("FCGIDCmdOptions", set_cmd_options, NULL, RSRC_CONF,
"set processing options for a FastCGI command"),
- AP_INIT_TAKE12("FCGIDDefaultInitEnv", add_default_env_vars, NULL, RSRC_CONF,
+ AP_INIT_TAKE12("FCGIDInitialEnv", add_default_env_vars, NULL, RSRC_CONF,
"an environment variable name and optional value to pass to FastCGI."),
- AP_INIT_TAKE1("FCGIDDefaultMaxClassProcessCount",
+ AP_INIT_TAKE1("FCGIDMaxProcessesPerClass",
set_max_class_process,
NULL, RSRC_CONF,
"Max process count of one class of fastcgi application"),
- AP_INIT_TAKE1("FCGIDDefaultMinClassProcessCount",
+ AP_INIT_TAKE1("FCGIDMinProcessesPerClass",
set_min_class_process,
NULL, RSRC_CONF,
"Min process count of one class of fastcgi application"),
@@ -638,12 +638,12 @@
"scan interval for idle timeout process"),
AP_INIT_TAKE1("FCGIDIdleTimeout", set_idle_timeout, NULL, RSRC_CONF,
"an idle fastcgi application will be killed after IdleTimeout"),
- AP_INIT_TAKE1("FCGIDIPCCommTimeout", set_ipc_comm_timeout, NULL, RSRC_CONF,
+ AP_INIT_TAKE1("FCGIDIOTimeout", set_ipc_comm_timeout, NULL, RSRC_CONF,
"Communication timeout to fastcgi server"),
- AP_INIT_TAKE1("FCGIDIPCConnectTimeout", set_ipc_connect_timeout, NULL,
+ AP_INIT_TAKE1("FCGIDConnectTimeout", set_ipc_connect_timeout, NULL,
RSRC_CONF,
"Connect timeout to fastcgi server"),
- AP_INIT_TAKE1("FCGIDMaxProcessCount", set_max_process, NULL, RSRC_CONF,
+ AP_INIT_TAKE1("FCGIDMaxProcesses", set_max_process, NULL, RSRC_CONF,
"Max total process count"),
AP_INIT_TAKE1("FCGIDMaxRequestInMem", set_max_mem_request_len, NULL,
RSRC_CONF,
@@ -658,15 +658,15 @@
"CGI output buffer size"),
AP_INIT_TAKE1("FCGIDPassHeader", add_pass_headers, NULL, RSRC_CONF,
"Header name which will be passed to FastCGI as environment variable."),
- AP_INIT_TAKE1("FCGIDPHPFixPathinfoEnable",
+ AP_INIT_TAKE1("FCGIDFixPathinfo",
set_php_fix_pathinfo_enable,
NULL, RSRC_CONF,
"Set 1, if cgi.fix_pathinfo=1 in php.ini"),
AP_INIT_TAKE1("FCGIDProcessLifeTime", set_proc_lifetime, NULL, RSRC_CONF,
"fastcgi application lifetime"),
- AP_INIT_TAKE1("FCGIDSharememPath", set_shmpath, NULL, RSRC_CONF,
+ AP_INIT_TAKE1("FCGIDProcessTableFile", set_shmpath, NULL, RSRC_CONF,
"fastcgi shared memory file path"),
- AP_INIT_TAKE1("FCGIDSocketPath", set_socketpath, NULL, RSRC_CONF,
+ AP_INIT_TAKE1("FCGIDIPCDir", set_socketpath, NULL, RSRC_CONF,
"fastcgi socket file path"),
AP_INIT_TAKE1("FCGIDSpawnScore", set_spawn_score, NULL, RSRC_CONF,
"Score of spawn"),
@@ -696,15 +696,15 @@
AP_INIT_TAKE1("BusyTimeout", set_busy_timeout, NULL, RSRC_CONF,
"Deprecated - Use 'FCGIDBusyTimeout' instead"),
AP_INIT_TAKE12("DefaultInitEnv", add_default_env_vars, NULL, RSRC_CONF,
- "Deprecated - Use 'FCGIDDefaultInitEnv' instead"),
+ "Deprecated - Use 'FCGIDInitialEnv' instead"),
AP_INIT_TAKE1("DefaultMaxClassProcessCount",
set_max_class_process,
NULL, RSRC_CONF,
- "Deprecated - Use 'FCGIDDefaultMaxClassProcessCount' instead"),
+ "Deprecated - Use 'FCGIDMaxProcessesPerClass' instead"),
AP_INIT_TAKE1("DefaultMinClassProcessCount",
set_min_class_process,
NULL, RSRC_CONF,
- "Deprecated - Use 'FCGIDDefaultMinClassProcessCount' instead"),
+ "Deprecated - Use 'FCGIDMinProcessesPerClass' instead"),
AP_INIT_TAKE1("ErrorScanInterval", set_error_scan_interval, NULL,
RSRC_CONF,
"Deprecated - Use 'FCGIDErrorScanInterval' instead"),
@@ -737,12 +737,12 @@
AP_INIT_TAKE1("IdleTimeout", set_idle_timeout, NULL, RSRC_CONF,
"Deprecated - Use 'FCGIDIdleTimeout' instead"),
AP_INIT_TAKE1("IPCCommTimeout", set_ipc_comm_timeout, NULL, RSRC_CONF,
- "Deprecated - Use 'FCGIDIPCCommTimeout' instead"),
+ "Deprecated - Use 'FCGIDIOTimeout' instead"),
AP_INIT_TAKE1("IPCConnectTimeout", set_ipc_connect_timeout, NULL,
RSRC_CONF,
- "Deprecated - Use 'FCGIDIPCConnectTimeout' instead"),
+ "Deprecated - Use 'FCGIDConnectTimeout' instead"),
AP_INIT_TAKE1("MaxProcessCount", set_max_process, NULL, RSRC_CONF,
- "Deprecated - Use 'FCGIDMaxProcessCount' instead"),
+ "Deprecated - Use 'FCGIDMaxProcesses' instead"),
AP_INIT_TAKE1("MaxRequestInMem", set_max_mem_request_len, NULL,
RSRC_CONF,
"Deprecated - Use 'FCGIDMaxRequestInMem' instead"),
@@ -759,13 +759,13 @@
AP_INIT_TAKE1("PHP_Fix_Pathinfo_Enable",
set_php_fix_pathinfo_enable,
NULL, RSRC_CONF,
- "Deprecated - Use 'FCGIDPHPFixPathinfoEnable' instead"),
+ "Deprecated - Use 'FCGIDFixPathinfo' instead"),
AP_INIT_TAKE1("ProcessLifeTime", set_proc_lifetime, NULL, RSRC_CONF,
"Deprecated - Use 'FCGIDProcessLifeTime' instead"),
AP_INIT_TAKE1("SharememPath", set_shmpath, NULL, RSRC_CONF,
- "Deprecated - Use 'FCGIDSharememPath' instead"),
+ "Deprecated - Use 'FCGIDProcessTableFile' instead"),
AP_INIT_TAKE1("SocketPath", set_socketpath, NULL, RSRC_CONF,
- "Deprecated - Use 'FCGIDSocketPath' instead"),
+ "Deprecated - Use 'FCGIDIPCDir' instead"),
AP_INIT_TAKE1("SpawnScore", set_spawn_score, NULL, RSRC_CONF,
"Deprecated - Use 'FCGIDSpawnScore' instead"),
AP_INIT_TAKE1("SpawnScoreUpLimit", set_spawnscore_uplimit, NULL,
Modified: httpd/mod_fcgid/trunk/tools/fixconf.sed
URL: http://svn.apache.org/viewvc/httpd/mod_fcgid/trunk/tools/fixconf.sed?rev=822252&r1=822251&r2=822252&view=diff
==============================================================================
--- httpd/mod_fcgid/trunk/tools/fixconf.sed (original)
+++ httpd/mod_fcgid/trunk/tools/fixconf.sed Tue Oct 6 12:45:29 2009
@@ -21,9 +21,9 @@
# First we fix occurences at the beginning of lines
s/^BusyScanInterval/FCGIDBusyScanInterval/g
s/^BusyTimeout/FCGIDBusyTimeout/g
-s/^DefaultInitEnv/FCGIDDefaultInitEnv/g
-s/^DefaultMaxClassProcessCount/FCGIDDefaultMaxClassProcessCount/g
-s/^DefaultMinClassProcessCount/FCGIDDefaultMinClassProcessCount/g
+s/^DefaultInitEnv/FCGIDInitialEnv/g
+s/^DefaultMaxClassProcessCount/FCGIDMaxProcessesPerClass/g
+s/^DefaultMinClassProcessCount/FCGIDMinProcessesPerClass/g
s/^ErrorScanInterval/FCGIDErrorScanInterval/g
s/^FastCgiAccessChecker/FCGIDAccessChecker/g
s/^FastCgiAccessCheckerAuthoritative/FCGIDAccessCheckerAuthoritative/g
@@ -34,18 +34,18 @@
s/^FCGIWrapper/FCGIDWrapper/g
s/^IdleScanInterval/FCGIDIdleScanInterval/g
s/^IdleTimeout/FCGIDIdleTimeout/g
-s/^IPCCommTimeout/FCGIDIPCCommTimeout/g
-s/^IPCConnectTimeout/FCGIDIPCConnectTimeout/g
-s/^MaxProcessCount/FCGIDMaxProcessCount/g
+s/^IPCCommTimeout/FCGIDIOTimeout/g
+s/^IPCConnectTimeout/FCGIDConnectTimeout/g
+s/^MaxProcessCount/FCGIDMaxProcesses/g
s/^MaxRequestInMem/FCGIDMaxRequestInMem/g
s/^MaxRequestLen/FCGIDMaxRequestLen/g
s/^MaxRequestsPerProcess/FCGIDMaxRequestsPerProcess/g
s/^OutputBufferSize/FCGIDOutputBufferSize/g
s/^PassHeader/FCGIDPassHeader/g
-s/^PHP_Fix_Pathinfo_Enable/FCGIDPHPFixPathinfoEnable/g
+s/^PHP_Fix_Pathinfo_Enable/FCGIDFixPathinfo/g
s/^ProcessLifeTime/FCGIDProcessLifeTime/g
-s/^SharememPath/FCGIDSharememPath/g
-s/^SocketPath/FCGIDSocketPath/g
+s/^SharememPath/FCGIDProcessTableFile/g
+s/^SocketPath/FCGIDIPCDir/g
s/^SpawnScore/FCGIDSpawnScore/g
s/^SpawnScoreUpLimit/FCGIDSpawnScoreUpLimit/g
s/^TerminationScore/FCGIDTerminationScore/g
@@ -55,9 +55,9 @@
# the ones, that are already OK
s/\([^D]\)BusyScanInterval/\1FCGIDBusyScanInterval/g
s/\([^D]\)BusyTimeout/\1FCGIDBusyTimeout/g
-s/\([^D]\)DefaultInitEnv/\1FCGIDDefaultInitEnv/g
-s/\([^D]\)DefaultMaxClassProcessCount/\1FCGIDDefaultMaxClassProcessCount/g
-s/\([^D]\)DefaultMinClassProcessCount/\1FCGIDDefaultMinClassProcessCount/g
+s/\([^D]\)DefaultInitEnv/\1FCGIDInitialEnv/g
+s/\([^D]\)DefaultMaxClassProcessCount/\1FCGIDMaxProcessesPerClass/g
+s/\([^D]\)DefaultMinClassProcessCount/\1FCGIDMinProcessesPerClass/g
s/\([^D]\)ErrorScanInterval/\1FCGIDErrorScanInterval/g
s/\([^D]\)FastCgiAccessChecker/\1FCGIDAccessChecker/g
s/\([^D]\)FastCgiAccessCheckerAuthoritative/\1FCGIDAccessCheckerAuthoritative/g
@@ -68,18 +68,18 @@
s/\([^D]\)FCGIWrapper/\1FCGIDWrapper/g
s/\([^D]\)IdleScanInterval/\1FCGIDIdleScanInterval/g
s/\([^D]\)IdleTimeout/\1FCGIDIdleTimeout/g
-s/\([^D]\)IPCCommTimeout/\1FCGIDIPCCommTimeout/g
-s/\([^D]\)IPCConnectTimeout/\1FCGIDIPCConnectTimeout/g
-s/\([^D]\)MaxProcessCount/\1FCGIDMaxProcessCount/g
+s/\([^D]\)IPCCommTimeout/\1FCGIDIOTimeout/g
+s/\([^D]\)IPCConnectTimeout/\1FCGIDConnectTimeout/g
+s/\([^D]\)MaxProcessCount/\1FCGIDMaxProcesses/g
s/\([^D]\)MaxRequestInMem/\1FCGIDMaxRequestInMem/g
s/\([^D]\)MaxRequestLen/\1FCGIDMaxRequestLen/g
s/\([^D]\)MaxRequestsPerProcess/\1FCGIDMaxRequestsPerProcess/g
s/\([^D]\)OutputBufferSize/\1FCGIDOutputBufferSize/g
s/\([^D]\)PassHeader/\1FCGIDPassHeader/g
-s/\([^D]\)PHP_Fix_Pathinfo_Enable/\1FCGIDPHPFixPathinfoEnable/g
+s/\([^D]\)PHP_Fix_Pathinfo_Enable/\1FCGIDFixPathinfo/g
s/\([^D]\)ProcessLifeTime/\1FCGIDProcessLifeTime/g
-s/\([^D]\)SharememPath/\1FCGIDSharememPath/g
-s/\([^D]\)SocketPath/\1FCGIDSocketPath/g
+s/\([^D]\)SharememPath/\1FCGIDProcessTableFile/g
+s/\([^D]\)SocketPath/\1FCGIDIPCDir/g
s/\([^D]\)SpawnScore/\1FCGIDSpawnScore/g
s/\([^D]\)SpawnScoreUpLimit/\1FCGIDSpawnScoreUpLimit/g
s/\([^D]\)TerminationScore/\1FCGIDTerminationScore/g