Jeff Trawick <[EMAIL PROTECTED]> writes:
> Jim Jagielski <[EMAIL PROTECTED]> writes:
>
> > Jeff Trawick wrote:
> > >
> > > > Bring 2.0 up to parity, a bit, with how much info we provide to
> > > > the admin regarding valid values for AcceptMutex. Should also
> > > > tell 'em what "default" actually maps to, but that can wait.
> > >
> > > I don't think this works as you desired.
> > >
> > > I just did an update (no diffs in this tree) and for a config with no
> > > AcceptMutex I get this at startup:
> > >
> > > [notice] AcceptMutex: Valid accept mutexes for this platform and MPM
> > > are: default, fcntl, sysvsem, pthread.
Here is a prototype showing the help text displayed via httpd -L,
keeping the use of AP_INIT_TAKE1.
It compiles/runs with no warnings or errors with gcc -Wall and xlc
(IBM's fairly anal compiler for AIX).
Index: server/core.c
===================================================================
RCS file: /home/cvspublic/httpd-2.0/server/core.c,v
retrieving revision 1.164
diff -u -r1.164 core.c
--- server/core.c 20 Mar 2002 02:05:42 -0000 1.164
+++ server/core.c 20 Mar 2002 18:39:39 -0000
@@ -2802,6 +2802,18 @@
* The AllowOverride of Fileinfo allows webmasters to turn it off
*/
+#ifdef AP_MPM_WANT_SET_ACCEPT_LOCK_MECH
+static const char accept_mutex_help_string[] =
+"default"
+#if APR_HAS_SYSVSEM_SERIALIZE
+", sysvsem"
+#endif
+#if APR_HAS_FCNTL_SERIALIZE
+", fcntl"
+#endif
+;
+#endif
+
static const command_rec core_cmds[] = {
/* Old access config file commands */
@@ -3003,7 +3015,7 @@
#endif
#ifdef AP_MPM_WANT_SET_ACCEPT_LOCK_MECH
AP_INIT_TAKE1("AcceptMutex", ap_mpm_set_accept_lock_mech, NULL, RSRC_CONF, \
- "The system mutex implementation to use for the accept mutex"),
+ accept_mutex_help_string),
#endif
{ NULL }
};
--
Jeff Trawick | [EMAIL PROTECTED]
Born in Roswell... married an alien...
