httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From traw...@apache.org
Subject svn commit: r1312060 - in /httpd/mod_fcgid/trunk: docs/manual/mod/mod_fcgid.xml modules/fcgid/fcgid_conf.c modules/fcgid/fcgid_conf.h modules/fcgid/mod_fcgid.c
Date Wed, 11 Apr 2012 00:54:33 GMT
Author: trawick
Date: Wed Apr 11 00:54:32 2012
New Revision: 1312060

URL: http://svn.apache.org/viewvc?rev=1312060&view=rev
Log:
Change the style of the FcgidWin32PreventOrphans directive from _NO_ARGS (present means enabled)
to _FLAG ("On"|"Off")
(tweak to r1311569)

Modified:
    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/fcgid_conf.h
    httpd/mod_fcgid/trunk/modules/fcgid/mod_fcgid.c

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=1312060&r1=1312059&r2=1312060&view=diff
==============================================================================
--- httpd/mod_fcgid/trunk/docs/manual/mod/mod_fcgid.xml (original)
+++ httpd/mod_fcgid/trunk/docs/manual/mod/mod_fcgid.xml Wed Apr 11 00:54:32 2012
@@ -1126,8 +1126,8 @@
   <directivesynopsis>
     <name>FcgidWin32PreventOrphans</name>
     <description>Job Control orphan prevention for fcgi workers.</description>
-    <syntax>FcgidWin32PreventOrphans</syntax>
-    <default>[disabled]</default>
+    <syntax>FcgidWin32PreventOrphans <em>On|Off</em></syntax>
+    <default>FcgidWin32PreventOrphans Off</default>
     <contextlist><context>server config</context></contextlist>
     <usage>
       <p>Uses Job Control Objects on Windows, only, to enforce shutdown of all

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=1312060&r1=1312059&r2=1312060&view=diff
==============================================================================
--- httpd/mod_fcgid/trunk/modules/fcgid/fcgid_conf.c (original)
+++ httpd/mod_fcgid/trunk/modules/fcgid/fcgid_conf.c Wed Apr 11 00:54:32 2012
@@ -770,7 +770,7 @@ const char *set_access_authoritative(cmd
  *
  */
 const char *set_win32_prevent_process_orphans(cmd_parms *cmd, void *dummy,
-                                              char *arg)
+                                              int arg)
 {
     server_rec *s = cmd->server;
     fcgid_server_conf *config = ap_get_module_config(s->module_config,
@@ -781,7 +781,7 @@ const char *set_win32_prevent_process_or
         return err;
     }
 
-    if (config->hJobObjectForAutoCleanup == NULL) {
+    if (arg && config->hJobObjectForAutoCleanup == NULL) {
         /* Create Win32 job object to prevent CGI process oprhaning
          */
         JOBOBJECT_EXTENDED_LIMIT_INFORMATION job_info = { 0 };

Modified: httpd/mod_fcgid/trunk/modules/fcgid/fcgid_conf.h
URL: http://svn.apache.org/viewvc/httpd/mod_fcgid/trunk/modules/fcgid/fcgid_conf.h?rev=1312060&r1=1312059&r2=1312060&view=diff
==============================================================================
--- httpd/mod_fcgid/trunk/modules/fcgid/fcgid_conf.h (original)
+++ httpd/mod_fcgid/trunk/modules/fcgid/fcgid_conf.h Wed Apr 11 00:54:32 2012
@@ -255,7 +255,7 @@ const char *set_max_requests_per_process
 
 #ifdef WIN32
 const char *set_win32_prevent_process_orphans(cmd_parms *cmd, void *dummy,
-                                              char *arg);
+                                              int arg);
 #endif
 
 const char *set_cmd_options(cmd_parms *cmd, void *dummy,

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=1312060&r1=1312059&r2=1312060&view=diff
==============================================================================
--- httpd/mod_fcgid/trunk/modules/fcgid/mod_fcgid.c (original)
+++ httpd/mod_fcgid/trunk/modules/fcgid/mod_fcgid.c Wed Apr 11 00:54:32 2012
@@ -896,10 +896,10 @@ static const command_rec fcgid_cmds[] = 
                   RSRC_CONF,
                   "scan interval for zombie process"),
 #ifdef WIN32
-    AP_INIT_NO_ARGS("FcgidWin32PreventOrphans",
-                    set_win32_prevent_process_orphans, NULL, RSRC_CONF,
-                    "Prevented fcgi process orphaning during Apache worker "
-                    "abrupt shutdowns [see documentation]"),
+    AP_INIT_FLAG("FcgidWin32PreventOrphans",
+                 set_win32_prevent_process_orphans, NULL, RSRC_CONF,
+                 "Prevented fcgi process orphaning during Apache worker "
+                 "abrupt shutdowns [see documentation]"),
 #endif
 
     /* The following directives are all deprecated in favor



Mime
View raw message