httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From traw...@apache.org
Subject svn commit: r815897 - in /httpd/mod_fcgid/trunk: CHANGES-FCGID README-FCGID docs/manual/mod/mod_fcgid.xml modules/fcgid/fcgid_conf.c
Date Wed, 16 Sep 2009 17:24:44 GMT
Author: trawick
Date: Wed Sep 16 17:24:43 2009
New Revision: 815897

URL: http://svn.apache.org/viewvc?rev=815897&view=rev
Log:
Stop allowing these directives inside <VirtualHost >:

BusyScanInterval, DefaultMaxClassProcessCount, 
DefaultMinProcessCount, ErrorScanInterval, IdleScanInterval, 
IdleTimeout, MaxProcessCount, PHP_Fix_Pathinfo_Enable, 
ProcessLifetime, SharedmemPath, SocketPath, SpawnScore,
SpawnScoreUpLimit, TerminationScore, TimeScore, and 
ZombieScanInterval

They were allowed in that context but ignored in previous
releases.

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

Modified: httpd/mod_fcgid/trunk/CHANGES-FCGID
URL: http://svn.apache.org/viewvc/httpd/mod_fcgid/trunk/CHANGES-FCGID?rev=815897&r1=815896&r2=815897&view=diff
==============================================================================
--- httpd/mod_fcgid/trunk/CHANGES-FCGID [utf8] (original)
+++ httpd/mod_fcgid/trunk/CHANGES-FCGID [utf8] Wed Sep 16 17:24:43 2009
@@ -1,7 +1,14 @@
                                                          -*- coding: utf-8 -*-
 Changes with mod_fcgid 2.3.2
 
-
+  *) The following directives are no longer allowed in a virtual host
+     context: BusyScanInterval, DefaultMaxClassProcessCount, 
+     DefaultMinProcessCount, ErrorScanInterval, IdleScanInterval, 
+     IdleTimeout, MaxProcessCount, PHP_Fix_Pathinfo_Enable, 
+     ProcessLifetime, SharedmemPath, SocketPath, SpawnScore,
+     SpawnScoreUpLimit, TerminationScore, TimeScore, and 
+     ZombieScanInterval.  They were allowed but ignored in previous
+     releases.  [Jeff Trawick]
 
 Changes with mod_fcgid 2.3.1
 

Modified: httpd/mod_fcgid/trunk/README-FCGID
URL: http://svn.apache.org/viewvc/httpd/mod_fcgid/trunk/README-FCGID?rev=815897&r1=815896&r2=815897&view=diff
==============================================================================
--- httpd/mod_fcgid/trunk/README-FCGID (original)
+++ httpd/mod_fcgid/trunk/README-FCGID Wed Sep 16 17:24:43 2009
@@ -131,6 +131,19 @@
 before installing the httpd\manual files.
 
 
+Incompatible configuration changes
+----------------------------------
+Some changes have been made in the ASF release of mod_fcgid which can affect
+existing configurations:
+
+i. 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 IdleTimeout, MaxProcessCount, PHP_Fix_Pathinfo_Enable,
+   ProcessLifetime, and others.  (Consult CHANGES_FCGID for the complete
+   list.)
+
+
 Acknowledgements
 ----------------
 Portions of this software were originally developed by

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=815897&r1=815896&r2=815897&view=diff
==============================================================================
--- httpd/mod_fcgid/trunk/docs/manual/mod/mod_fcgid.xml (original)
+++ httpd/mod_fcgid/trunk/docs/manual/mod/mod_fcgid.xml Wed Sep 16 17:24:43 2009
@@ -64,7 +64,7 @@
     <description>scan interval for busy timeout process</description>
     <syntax>BusyScanInterval <em>seconds</em></syntax>
     <default>BusyScanInterval 120</default>
-    <contextlist><context>server config</context> <context>virtual
host</context></contextlist>
+    <contextlist><context>server config</context></contextlist>
     <usage>
       <p>The module performs the 
       <directive module="mod_fcgid">BusyTimeout</directive> check at this 
@@ -109,7 +109,7 @@
     <description>Max process count of one class of FastCGI application</description>
     <syntax>DefaultMaxClassProcessCount <em>value</em></syntax>
     <default>DefaultMaxClassProcessCount 100</default>
-    <contextlist><context>server config</context> <context>virtual
host</context></contextlist>
+    <contextlist><context>server config</context></contextlist>
     <usage>
       <p>A process class is the set of processes which were started by the same
       command, and share certain other characteristics such as virtual host and
@@ -125,7 +125,7 @@
     <description>Min process count of one class of FastCGI application</description>
     <syntax>DefaultMinClassProcessCount <em>value</em></syntax>
     <default>DefaultMinClassProcessCount 3</default>
-    <contextlist><context>server config</context> <context>virtual
host</context></contextlist>
+    <contextlist><context>server config</context></contextlist>
     <usage>
       <p>A process class is the set of processes which were started by the same
       command, and share certain other characteristics such as virtual host and
@@ -141,7 +141,7 @@
     <description>scan interval for exited process</description>
     <syntax>ErrorScanInterval <em>seconds</em></syntax>
     <default>ErrorScanInterval 3</default>
-    <contextlist><context>server config</context> <context>virtual
host</context></contextlist>
+    <contextlist><context>server config</context></contextlist>
     <usage>
       <p>This is the interval at which the module will handle
       pending process termination.  Termination is pending for
@@ -347,7 +347,7 @@
     <description>scan interval for idle timeout process</description>
     <syntax>IdleScanInterval <em>seconds</em></syntax>
     <default>IdleScanInterval 120</default>
-    <contextlist><context>server config</context> <context>virtual
host</context></contextlist>
+    <contextlist><context>server config</context></contextlist>
     <usage>
       <p>This is the interval at which the module will search for
       processes which have exceeded 
@@ -361,7 +361,7 @@
     <description>An idle FastCGI application will be killed after IdleTimeout</description>
     <syntax>IdleTimeout <em>seconds</em></syntax>
     <default>IdleTimeout 300</default>
-    <contextlist><context>server config</context> <context>virtual
host</context></contextlist>
+    <contextlist><context>server config</context></contextlist>
     <usage>
       <p>Application processes which have not handled a request
       for this period of time will be terminated.</p>
@@ -405,7 +405,7 @@
     <description>maximum number of FastCGI application processes</description>
     <syntax>MaxProcessCount <em>value</em></syntax>
     <default>MaxProcessCount 1000</default>
-    <contextlist><context>server config</context> <context>virtual
host</context></contextlist>
+    <contextlist><context>server config</context></contextlist>
     <usage>
       <p>This directive sets the maximum number of FastCGI application
       processes which can be active at one time.</p>
@@ -482,7 +482,7 @@
     setting</description>
     <syntax>PHP_Fix_Pathinfo_Enable 1</syntax>
     <default>PHP_Fix_Pathinfo_Enable 0</default>
-    <contextlist><context>server config</context> <context>virtual
host</context></contextlist>
+    <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.
@@ -497,7 +497,7 @@
     <description>maximum FastCGI application process lifetime</description>
     <syntax>ProcessLifeTime <em>seconds</em></syntax>
     <default>ProcessLifeTime 3600</default>
-    <contextlist><context>server config</context> <context>virtual
host</context></contextlist>
+    <contextlist><context>server config</context></contextlist>
     <usage>
       <p>Idle application processes which have existed for greater
       than this time will be terminated.</p>
@@ -509,7 +509,7 @@
     <description>shared memory file path</description>
     <syntax>SharememPath <em>pathname</em></syntax>
     <default>SharememPath logs/fcgid_shm</default>
-    <contextlist><context>server config</context> <context>virtual
host</context></contextlist>
+    <contextlist><context>server config</context></contextlist>
     <usage>
       <p>This module uses shared memory on Unix to maintain state which
       is shared between httpd processes.  This directive specifies the
@@ -522,7 +522,7 @@
     <description>directory for AF_UNIX sockets (Unix) or pipes (Windows)</description>
     <syntax>SocketPath <em>pathname</em></syntax>
     <default>SocketPath logs/fcgidsock</default>
-    <contextlist><context>server config</context> <context>virtual
host</context></contextlist>
+    <contextlist><context>server config</context></contextlist>
     <usage>
       <p>This module uses AF_UNIX sockets or named pipes, depending on the
       platform, to communicate with FastCGI applications.  This directive
@@ -536,7 +536,7 @@
     <description>Each spawn adds this value to the process activity score.</description>
     <syntax>SpawnScore <em>value</em></syntax>
     <default>SpawnScore 1</default>
-    <contextlist><context>server config</context> <context>virtual
host</context></contextlist>
+    <contextlist><context>server config</context></contextlist>
     <usage>
       <p>Refer to the <directive module="mod_fcgid">SpawnScoreUpLimit</directive>
       directive for more information.</p>
@@ -549,7 +549,7 @@
     a spawn to occur</description>
     <syntax>SpawnScoreUpLimit <em>value</em></syntax>
     <default>SpawnScoreUpLimit 10</default>
-    <contextlist><context>server config</context> <context>virtual
host</context></contextlist>
+    <contextlist><context>server config</context></contextlist>
     <usage>
       <p>The module maintains a process activity score for each FastCGI
       application which represents process activity; it uses that score to 
@@ -573,7 +573,7 @@
     score.</description>
     <syntax>TerminationScore <em>value</em></syntax>
     <default>TerminationScore 2</default>
-    <contextlist><context>server config</context> <context>virtual
host</context></contextlist>
+    <contextlist><context>server config</context></contextlist>
     <usage>
       <p>Refer to the <directive module="mod_fcgid">SpawnScoreUpLimit</directive>
       directive for more information.</p>
@@ -586,7 +586,7 @@
     second</description>
     <syntax>TimeScore <em>value</em></syntax>
     <default>TimeScore 1</default>
-    <contextlist><context>server config</context> <context>virtual
host</context></contextlist>
+    <contextlist><context>server config</context></contextlist>
     <usage>
       <p>Refer to the <directive module="mod_fcgid">SpawnScoreUpLimit</directive>
       directive for more information.</p>
@@ -598,7 +598,7 @@
     <description>scan interval for zombie process</description>
     <syntax>ZombieScanInterval <em>seconds</em></syntax>
     <default>ZombieScanInterval 3</default>
-    <contextlist><context>server config</context> <context>virtual
host</context></contextlist>
+    <contextlist><context>server config</context></contextlist>
     <usage>
       <p>The module checks for exited FastCGI applications at this interval.
       During this period of time, the application may exist in the process

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=815897&r1=815896&r2=815897&view=diff
==============================================================================
--- httpd/mod_fcgid/trunk/modules/fcgid/fcgid_conf.c (original)
+++ httpd/mod_fcgid/trunk/modules/fcgid/fcgid_conf.c Wed Sep 16 17:24:43 2009
@@ -161,6 +161,12 @@
     server_rec *s = cmd->server;
     fcgid_server_conf *config =
         ap_get_module_config(s->module_config, &fcgid_module);
+    const char *err = ap_check_cmd_context(cmd, GLOBAL_ONLY);
+
+    if (err != NULL) {
+        return err;
+    }
+
     config->idle_timeout = atol(arg);
     return NULL;
 }
@@ -178,6 +184,12 @@
     server_rec *s = cmd->server;
     fcgid_server_conf *config =
         ap_get_module_config(s->module_config, &fcgid_module);
+    const char *err = ap_check_cmd_context(cmd, GLOBAL_ONLY);
+
+    if (err != NULL) {
+        return err;
+    }
+
     config->idle_scan_interval = atol(arg);
     return NULL;
 }
@@ -211,6 +223,12 @@
     server_rec *s = cmd->server;
     fcgid_server_conf *config =
         ap_get_module_config(s->module_config, &fcgid_module);
+    const char *err = ap_check_cmd_context(cmd, GLOBAL_ONLY);
+
+    if (err != NULL) {
+        return err;
+    }
+
     config->busy_scan_interval = atol(arg);
     return NULL;
 }
@@ -229,6 +247,12 @@
     server_rec *s = cmd->server;
     fcgid_server_conf *config =
         ap_get_module_config(s->module_config, &fcgid_module);
+    const char *err = ap_check_cmd_context(cmd, GLOBAL_ONLY);
+
+    if (err != NULL) {
+        return err;
+    }
+
     config->proc_lifetime = atol(arg);
     return NULL;
 }
@@ -246,6 +270,12 @@
     server_rec *s = cmd->server;
     fcgid_server_conf *config =
         ap_get_module_config(s->module_config, &fcgid_module);
+    const char *err = ap_check_cmd_context(cmd, GLOBAL_ONLY);
+
+    if (err != NULL) {
+        return err;
+    }
+
     config->error_scan_interval = atol(arg);
     return NULL;
 }
@@ -264,6 +294,12 @@
     server_rec *s = cmd->server;
     fcgid_server_conf *config =
         ap_get_module_config(s->module_config, &fcgid_module);
+    const char *err = ap_check_cmd_context(cmd, GLOBAL_ONLY);
+
+    if (err != NULL) {
+        return err;
+    }
+
     config->zombie_scan_interval = atol(arg);
     return NULL;
 }
@@ -281,6 +317,12 @@
     server_rec *s = cmd->server;
     fcgid_server_conf *config =
         ap_get_module_config(s->module_config, &fcgid_module);
+    const char *err = ap_check_cmd_context(cmd, GLOBAL_ONLY);
+
+    if (err != NULL) {
+        return err;
+    }
+
     config->sockname_prefix = ap_server_root_relative(cmd->pool, arg);
     if (!config->sockname_prefix)
         return "Invalid socket path";
@@ -300,6 +342,12 @@
     server_rec *s = cmd->server;
     fcgid_server_conf *config =
         ap_get_module_config(s->module_config, &fcgid_module);
+    const char *err = ap_check_cmd_context(cmd, GLOBAL_ONLY);
+
+    if (err != NULL) {
+        return err;
+    }
+
     config->shmname_path = ap_server_root_relative(cmd->pool, arg);
     if (!config->shmname_path)
         return "Invalid shmname path";
@@ -320,6 +368,12 @@
     server_rec *s = cmd->server;
     fcgid_server_conf *config =
         ap_get_module_config(s->module_config, &fcgid_module);
+    const char *err = ap_check_cmd_context(cmd, GLOBAL_ONLY);
+
+    if (err != NULL) {
+        return err;
+    }
+
     config->spawnscore_uplimit = atol(arg);
     return NULL;
 }
@@ -372,6 +426,12 @@
     server_rec *s = cmd->server;
     fcgid_server_conf *config =
         ap_get_module_config(s->module_config, &fcgid_module);
+    const char *err = ap_check_cmd_context(cmd, GLOBAL_ONLY);
+
+    if (err != NULL) {
+        return err;
+    }
+
     config->spawn_score = atol(arg);
     return NULL;
 }
@@ -388,6 +448,12 @@
     server_rec *s = cmd->server;
     fcgid_server_conf *config =
         ap_get_module_config(s->module_config, &fcgid_module);
+    const char *err = ap_check_cmd_context(cmd, GLOBAL_ONLY);
+
+    if (err != NULL) {
+        return err;
+    }
+
     config->time_score = atol(arg);
     return NULL;
 }
@@ -405,6 +471,12 @@
     server_rec *s = cmd->server;
     fcgid_server_conf *config =
         ap_get_module_config(s->module_config, &fcgid_module);
+    const char *err = ap_check_cmd_context(cmd, GLOBAL_ONLY);
+
+    if (err != NULL) {
+        return err;
+    }
+
     config->termination_score = atol(arg);
     return NULL;
 }
@@ -421,6 +493,12 @@
     server_rec *s = cmd->server;
     fcgid_server_conf *config =
         ap_get_module_config(s->module_config, &fcgid_module);
+    const char *err = ap_check_cmd_context(cmd, GLOBAL_ONLY);
+
+    if (err != NULL) {
+        return err;
+    }
+
     config->max_process_count = atol(arg);
     return NULL;
 }
@@ -455,6 +533,12 @@
     server_rec *s = cmd->server;
     fcgid_server_conf *config =
         ap_get_module_config(s->module_config, &fcgid_module);
+    const char *err = ap_check_cmd_context(cmd, GLOBAL_ONLY);
+
+    if (err != NULL) {
+        return err;
+    }
+
     config->max_class_process_count = atol(arg);
     return NULL;
 }
@@ -473,6 +557,12 @@
     server_rec *s = cmd->server;
     fcgid_server_conf *config =
         ap_get_module_config(s->module_config, &fcgid_module);
+    const char *err = ap_check_cmd_context(cmd, GLOBAL_ONLY);
+
+    if (err != NULL) {
+        return err;
+    }
+
     config->min_class_process_count = atol(arg);
     return NULL;
 }
@@ -491,6 +581,12 @@
     server_rec *s = cmd->server;
     fcgid_server_conf *config =
         ap_get_module_config(s->module_config, &fcgid_module);
+    const char *err = ap_check_cmd_context(cmd, GLOBAL_ONLY);
+
+    if (err != NULL) {
+        return err;
+    }
+
     config->php_fix_pathinfo_enable = atol(arg);
     return NULL;
 }



Mime
View raw message