httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rj...@apache.org
Subject svn commit: r817338 - /httpd/mod_fcgid/trunk/modules/fcgid/mod_fcgid.c
Date Mon, 21 Sep 2009 17:37:42 GMT
Author: rjung
Date: Mon Sep 21 17:37:42 2009
New Revision: 817338

URL: http://svn.apache.org/viewvc?rev=817338&view=rev
Log:
Renaming mod_fcgid directives part 1:

- Use common prefix "FCGID"
- Switch from underscores to CamelCase

Here:

- cloning all AP_INIT_* in fcgid_cmds
- Adding "DEPRECATED" to the short explanation text (mod_info)

Modified:
    httpd/mod_fcgid/trunk/modules/fcgid/mod_fcgid.c

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=817338&r1=817337&r2=817338&view=diff
==============================================================================
--- httpd/mod_fcgid/trunk/modules/fcgid/mod_fcgid.c (original)
+++ httpd/mod_fcgid/trunk/modules/fcgid/mod_fcgid.c Mon Sep 21 17:37:42 2009
@@ -594,96 +594,191 @@
 }
 
 static const command_rec fcgid_cmds[] = {
-    AP_INIT_TAKE1("BusyScanInterval", set_busy_scan_interval, NULL,
+    AP_INIT_TAKE1("FCGIDBusyScanInterval", set_busy_scan_interval, NULL,
                   RSRC_CONF,
                   "scan interval for busy timeout process"),
-    AP_INIT_TAKE1("BusyTimeout", set_busy_timeout, NULL, RSRC_CONF,
+    AP_INIT_TAKE1("FCGIDBusyTimeout", set_busy_timeout, NULL, RSRC_CONF,
                   "a fastcgi application will be killed after handling a request for BusyTimeout"),
-    AP_INIT_TAKE12("DefaultInitEnv", add_default_env_vars, NULL, RSRC_CONF,
+    AP_INIT_TAKE12("FCGIDDefaultInitEnv", add_default_env_vars, NULL, RSRC_CONF,
                    "an environment variable name and optional value to pass to FastCGI."),
-    AP_INIT_TAKE1("DefaultMaxClassProcessCount",
+    AP_INIT_TAKE1("FCGIDDefaultMaxClassProcessCount",
                   set_max_class_process,
                   NULL, RSRC_CONF,
                   "Max process count of one class of fastcgi application"),
-    AP_INIT_TAKE1("DefaultMinClassProcessCount",
+    AP_INIT_TAKE1("FCGIDDefaultMinClassProcessCount",
                   set_min_class_process,
                   NULL, RSRC_CONF,
                   "Min process count of one class of fastcgi application"),
-    AP_INIT_TAKE1("ErrorScanInterval", set_error_scan_interval, NULL,
+    AP_INIT_TAKE1("FCGIDErrorScanInterval", set_error_scan_interval, NULL,
                   RSRC_CONF,
                   "scan interval for exited process"),
-    AP_INIT_TAKE1("FastCgiAccessChecker", set_access_info, NULL,
+    AP_INIT_TAKE1("FCGIDAccessChecker", set_access_info, NULL,
                   ACCESS_CONF | OR_FILEINFO,
                   "a absolute access checker file path"),
-    AP_INIT_FLAG("FastCgiAccessCheckerAuthoritative",
+    AP_INIT_FLAG("FCGIDAccessCheckerAuthoritative",
                  set_access_authoritative, NULL, ACCESS_CONF | OR_FILEINFO,
                  "Set to 'off' to allow access control to be passed along to lower modules
upon failure"),
-    AP_INIT_TAKE1("FastCgiAuthenticator", set_authenticator_info, NULL,
+    AP_INIT_TAKE1("FCGIDAuthenticator", set_authenticator_info, NULL,
                   ACCESS_CONF | OR_FILEINFO,
                   "a absolute authenticator file path"),
-    AP_INIT_FLAG("FastCgiAuthenticatorAuthoritative",
+    AP_INIT_FLAG("FCGIDAuthenticatorAuthoritative",
                  set_authenticator_authoritative, NULL,
                  ACCESS_CONF | OR_FILEINFO,
                  "Set to 'off' to allow authentication to be passed along to lower modules
upon failure"),
-    AP_INIT_TAKE1("FastCgiAuthorizer", set_authorizer_info, NULL,
+    AP_INIT_TAKE1("FCGIDAuthorizer", set_authorizer_info, NULL,
                   ACCESS_CONF | OR_FILEINFO,
                   "a absolute authorizer file path"),
-    AP_INIT_FLAG("FastCgiAuthorizerAuthoritative",
+    AP_INIT_FLAG("FCGIDAuthorizerAuthoritative",
                  set_authorizer_authoritative, NULL,
                  ACCESS_CONF | OR_FILEINFO,
                  "Set to 'off' to allow authorization to be passed along to lower modules
upon failure"),
+    AP_INIT_TAKE123("FCGIDWrapper", set_wrapper_config, NULL,
+                    RSRC_CONF | ACCESS_CONF | OR_FILEINFO,
+                    "The CGI wrapper file an optional URL suffix and an optional flag"),
+    AP_INIT_TAKE1("FCGIDIdleScanInterval", set_idle_scan_interval, NULL,
+                  RSRC_CONF,
+                  "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,
+                  "Communication timeout to fastcgi server"),
+    AP_INIT_TAKE1("FCGIDIPCConnectTimeout", set_ipc_connect_timeout, NULL,
+                  RSRC_CONF,
+                  "Connect timeout to fastcgi server"),
+    AP_INIT_TAKE1("FCGIDMaxProcessCount", set_max_process, NULL, RSRC_CONF,
+                  "Max total process count"),
+    AP_INIT_TAKE1("FCGIDMaxRequestInMem", set_max_mem_request_len, NULL,
+                  RSRC_CONF,
+                  "The part of HTTP request which greater than this limit will swap to disk"),
+    AP_INIT_TAKE1("FCGIDMaxRequestLen", set_max_request_len, NULL, RSRC_CONF,
+                  "Max HTTP request length in byte"),
+    AP_INIT_TAKE1("FCGIDMaxRequestsPerProcess", set_max_requests_per_process,
+                  NULL, RSRC_CONF,
+                  "Max requests handled by each fastcgi application"),
+    AP_INIT_TAKE1("FCGIDOutputBufferSize", set_output_buffersize, NULL,
+                  RSRC_CONF,
+                  "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",
+                  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,
+                  "fastcgi shared memory file path"),
+    AP_INIT_TAKE1("FCGIDSocketPath", set_socketpath, NULL, RSRC_CONF,
+                  "fastcgi socket file path"),
+    AP_INIT_TAKE1("FCGIDSpawnScore", set_spawn_score, NULL, RSRC_CONF,
+                  "Score of spawn"),
+    AP_INIT_TAKE1("FCGIDSpawnScoreUpLimit", set_spawnscore_uplimit, NULL,
+                  RSRC_CONF,
+                  "Spawn score up limit"),
+    AP_INIT_TAKE1("FCGIDTerminationScore", set_termination_score, NULL,
+                  RSRC_CONF,
+                  "Score of termination"),
+    AP_INIT_TAKE1("FCGIDTimeScore", set_time_score, NULL,
+                  RSRC_CONF,
+                  "Score of passage of time (in seconds)"),
+    AP_INIT_TAKE1("FCGIDZombieScanInterval", set_zombie_scan_interval, NULL,
+                  RSRC_CONF,
+                  "scan interval for zombie process"),
+
+    /* The following directives are all deprecated in favor
+     * of a consistent use of the FCGID prefix.
+     * Add all new command above this line.
+     */
+    AP_INIT_TAKE1("BusyScanInterval", set_busy_scan_interval, NULL,
+                  RSRC_CONF,
+                  "DEPRECATED - scan interval for busy timeout process"),
+    AP_INIT_TAKE1("BusyTimeout", set_busy_timeout, NULL, RSRC_CONF,
+                  "DEPRECATED - a fastcgi application will be killed after handling a request
for BusyTimeout"),
+    AP_INIT_TAKE12("DefaultInitEnv", add_default_env_vars, NULL, RSRC_CONF,
+                   "DEPRECATED - an environment variable name and optional value to pass
to FastCGI."),
+    AP_INIT_TAKE1("DefaultMaxClassProcessCount",
+                  set_max_class_process,
+                  NULL, RSRC_CONF,
+                  "DEPRECATED - Max process count of one class of fastcgi application"),
+    AP_INIT_TAKE1("DefaultMinClassProcessCount",
+                  set_min_class_process,
+                  NULL, RSRC_CONF,
+                  "DEPRECATED - Min process count of one class of fastcgi application"),
+    AP_INIT_TAKE1("ErrorScanInterval", set_error_scan_interval, NULL,
+                  RSRC_CONF,
+                  "DEPRECATED - scan interval for exited process"),
+    AP_INIT_TAKE1("FastCgiAccessChecker", set_access_info, NULL,
+                  ACCESS_CONF | OR_FILEINFO,
+                  "DEPRECATED - a absolute access checker file path"),
+    AP_INIT_FLAG("FastCgiAccessCheckerAuthoritative",
+                 set_access_authoritative, NULL, ACCESS_CONF | OR_FILEINFO,
+                 "DEPRECATED - Set to 'off' to allow access control to be passed along to
lower modules upon failure"),
+    AP_INIT_TAKE1("FastCgiAuthenticator", set_authenticator_info, NULL,
+                  ACCESS_CONF | OR_FILEINFO,
+                  "DEPRECATED - a absolute authenticator file path"),
+    AP_INIT_FLAG("FastCgiAuthenticatorAuthoritative",
+                 set_authenticator_authoritative, NULL,
+                 ACCESS_CONF | OR_FILEINFO,
+                 "DEPRECATED - Set to 'off' to allow authentication to be passed along to
lower modules upon failure"),
+    AP_INIT_TAKE1("FastCgiAuthorizer", set_authorizer_info, NULL,
+                  ACCESS_CONF | OR_FILEINFO,
+                  "DEPRECATED - a absolute authorizer file path"),
+    AP_INIT_FLAG("FastCgiAuthorizerAuthoritative",
+                 set_authorizer_authoritative, NULL,
+                 ACCESS_CONF | OR_FILEINFO,
+                 "DEPRECATED - Set to 'off' to allow authorization to be passed along to
lower modules upon failure"),
     AP_INIT_TAKE123("FCGIWrapper", set_wrapper_config, NULL,
-                   RSRC_CONF | ACCESS_CONF | OR_FILEINFO,
-                   "The CGI wrapper file an optional URL suffix and an optional flag"),
+                    RSRC_CONF | ACCESS_CONF | OR_FILEINFO,
+                    "DEPRECATED - The CGI wrapper file an optional URL suffix and an optional
flag"),
     AP_INIT_TAKE1("IdleScanInterval", set_idle_scan_interval, NULL,
                   RSRC_CONF,
-                  "scan interval for idle timeout process"),
+                  "DEPRECATED - scan interval for idle timeout process"),
     AP_INIT_TAKE1("IdleTimeout", set_idle_timeout, NULL, RSRC_CONF,
-                  "an idle fastcgi application will be killed after IdleTimeout"),
+                  "DEPRECATED - an idle fastcgi application will be killed after IdleTimeout"),
     AP_INIT_TAKE1("IPCCommTimeout", set_ipc_comm_timeout, NULL, RSRC_CONF,
-                  "Communication timeout to fastcgi server"),
+                  "DEPRECATED - Communication timeout to fastcgi server"),
     AP_INIT_TAKE1("IPCConnectTimeout", set_ipc_connect_timeout, NULL,
                   RSRC_CONF,
-                  "Connect timeout to fastcgi server"),
+                  "DEPRECATED - Connect timeout to fastcgi server"),
     AP_INIT_TAKE1("MaxProcessCount", set_max_process, NULL, RSRC_CONF,
-                  "Max total process count"),
+                  "DEPRECATED - Max total process count"),
     AP_INIT_TAKE1("MaxRequestInMem", set_max_mem_request_len, NULL,
                   RSRC_CONF,
-                  "The part of HTTP request which greater than this limit will swap to disk"),
+                  "DEPRECATED - The part of HTTP request which greater than this limit will
swap to disk"),
     AP_INIT_TAKE1("MaxRequestLen", set_max_request_len, NULL, RSRC_CONF,
-                  "Max HTTP request length in byte"),
+                  "DEPRECATED - Max HTTP request length in byte"),
     AP_INIT_TAKE1("MaxRequestsPerProcess", set_max_requests_per_process,
                   NULL, RSRC_CONF,
-                  "Max requests handled by each fastcgi application"),
+                  "DEPRECATED - Max requests handled by each fastcgi application"),
     AP_INIT_TAKE1("OutputBufferSize", set_output_buffersize, NULL,
                   RSRC_CONF,
-                  "CGI output buffer size"),
+                  "DEPRECATED - CGI output buffer size"),
     AP_INIT_TAKE1("PassHeader", add_pass_headers, NULL, RSRC_CONF,
-                  "Header name which will be passed to FastCGI as environment variable."),
+                  "DEPRECATED - Header name which will be passed to FastCGI as environment
variable."),
     AP_INIT_TAKE1("PHP_Fix_Pathinfo_Enable",
                   set_php_fix_pathinfo_enable,
                   NULL, RSRC_CONF,
-                  "Set 1, if cgi.fix_pathinfo=1 in php.ini"),
+                  "DEPRECATED - Set 1, if cgi.fix_pathinfo=1 in php.ini"),
     AP_INIT_TAKE1("ProcessLifeTime", set_proc_lifetime, NULL, RSRC_CONF,
-                  "fastcgi application lifetime"),
+                  "DEPRECATED - fastcgi application lifetime"),
     AP_INIT_TAKE1("SharememPath", set_shmpath, NULL, RSRC_CONF,
-                  "fastcgi share memory file path"),
+                  "DEPRECATED - fastcgi share memory file path"),
     AP_INIT_TAKE1("SocketPath", set_socketpath, NULL, RSRC_CONF,
-                  "fastcgi socket file path"),
+                  "DEPRECATED - fastcgi socket file path"),
     AP_INIT_TAKE1("SpawnScore", set_spawn_score, NULL, RSRC_CONF,
-                  "Score of spawn"),
+                  "DEPRECATED - Score of spawn"),
     AP_INIT_TAKE1("SpawnScoreUpLimit", set_spawnscore_uplimit, NULL,
                   RSRC_CONF,
-                  "Spawn score up limit"),
+                  "DEPRECATED - Spawn score up limit"),
     AP_INIT_TAKE1("TerminationScore", set_termination_score, NULL,
                   RSRC_CONF,
-                  "Score of termination"),
+                  "DEPRECATED - Score of termination"),
     AP_INIT_TAKE1("TimeScore", set_time_score, NULL,
                   RSRC_CONF,
-                  "Score of passage of time (in seconds)"),
+                  "DEPRECATED - Score of passage of time (in seconds)"),
     AP_INIT_TAKE1("ZombieScanInterval", set_zombie_scan_interval, NULL,
                   RSRC_CONF,
-                  "scan interval for zombie process"),
+                  "DEPRECATED - scan interval for zombie process"),
     {NULL}
 };
 



Mime
View raw message