You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by ni...@apache.org on 2008/11/04 01:44:56 UTC
svn commit: r711146 - in /httpd/httpd/trunk: modules/arch/unix/mod_unixd.c
os/unix/unixd.c os/unix/unixd.h server/mpm/experimental/event/event.c
server/mpm/prefork/prefork.c server/mpm/worker/worker.c
Author: niq
Date: Mon Nov 3 16:44:56 2008
New Revision: 711146
URL: http://svn.apache.org/viewvc?rev=711146&view=rev
Log:
Further unixd hacks to remove duplication between old-unixd and mod_unixd,
and get it working with old MPMS[1] + mod_unixd. It's still an uneasy
split, as some modules (mod_cgid, suexec)[2] also use unixd.
More thinking+hacking due.
[1] Should be prefork/worker/event, but only worker is tested.
[2] cgid is OK, suexec is untested.
Modified:
httpd/httpd/trunk/modules/arch/unix/mod_unixd.c
httpd/httpd/trunk/os/unix/unixd.c
httpd/httpd/trunk/os/unix/unixd.h
httpd/httpd/trunk/server/mpm/experimental/event/event.c
httpd/httpd/trunk/server/mpm/prefork/prefork.c
httpd/httpd/trunk/server/mpm/worker/worker.c
Modified: httpd/httpd/trunk/modules/arch/unix/mod_unixd.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/arch/unix/mod_unixd.c?rev=711146&r1=711145&r2=711146&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/arch/unix/mod_unixd.c (original)
+++ httpd/httpd/trunk/modules/arch/unix/mod_unixd.c Mon Nov 3 16:44:56 2008
@@ -56,15 +56,19 @@
#define DEFAULT_GROUP "#-1"
#endif
+#if 0
typedef struct {
const char *user_name;
uid_t user_id;
gid_t group_id;
const char *chroot_dir;
} unixd_config_t;
+#else
+#include "unixd.h"
+#endif
-unixd_config_t unixd_config;
+//unixd_config_t unixd_config;
/* Set group privileges.
*
@@ -273,12 +277,22 @@
unixd_pre_config(apr_pool_t *pconf, apr_pool_t *plog,
apr_pool_t *ptemp)
{
+ apr_finfo_t wrapper;
unixd_config.user_name = DEFAULT_USER;
unixd_config.user_id = ap_uname2id(DEFAULT_USER);
unixd_config.group_id = ap_gname2id(DEFAULT_GROUP);
unixd_config.chroot_dir = NULL; /* none */
+ /* Check for suexec */
+ unixd_config.suexec_enabled = 0;
+ if ((apr_stat(&wrapper, SUEXEC_BIN, APR_FINFO_NORM, ptemp))
+ == APR_SUCCESS) {
+ if ((wrapper.protection & APR_USETID) && wrapper.user == 0) {
+ unixd_config.suexec_enabled = 1;
+ }
+ }
+
sys_privileges_handlers(1);
return OK;
}
@@ -311,3 +325,74 @@
unixd_cmds,
unixd_hooks
};
+
+AP_DECLARE(int) unixd_setup_child(void)
+{
+ if (set_group_privs()) {
+ return -1;
+ }
+
+ if (NULL != unixd_config.chroot_dir) {
+ if (geteuid()) {
+ ap_log_error(APLOG_MARK, APLOG_ALERT, errno, NULL,
+ "Cannot chroot when not started as root");
+ return -1;
+ }
+ if (chdir(unixd_config.chroot_dir) != 0) {
+ ap_log_error(APLOG_MARK, APLOG_ALERT, errno, NULL,
+ "Can't chdir to %s", unixd_config.chroot_dir);
+ return -1;
+ }
+ if (chroot(unixd_config.chroot_dir) != 0) {
+ ap_log_error(APLOG_MARK, APLOG_ALERT, errno, NULL,
+ "Can't chroot to %s", unixd_config.chroot_dir);
+ return -1;
+ }
+ if (chdir("/") != 0) {
+ ap_log_error(APLOG_MARK, APLOG_ALERT, errno, NULL,
+ "Can't chdir to new root");
+ return -1;
+ }
+ }
+
+#ifdef MPE
+ /* Only try to switch if we're running as MANAGER.SYS */
+ if (geteuid() == 1 && unixd_config.user_id > 1) {
+ GETPRIVMODE();
+ if (setuid(unixd_config.user_id) == -1) {
+ GETUSERMODE();
+ ap_log_error(APLOG_MARK, APLOG_ALERT, errno, NULL,
+ "setuid: unable to change to uid: %ld",
+ (long) unixd_config.user_id);
+ exit(1);
+ }
+ GETUSERMODE();
+ }
+#else
+ /* Only try to switch if we're running as root */
+ if (!geteuid() && (
+#ifdef _OSD_POSIX
+ os_init_job_environment(NULL, unixd_config.user_name, ap_exists_config_define("DEBUG")) != 0 ||
+#endif
+ setuid(unixd_config.user_id) == -1)) {
+ ap_log_error(APLOG_MARK, APLOG_ALERT, errno, NULL,
+ "setuid: unable to change to uid: %ld",
+ (long) unixd_config.user_id);
+ return -1;
+ }
+#if defined(HAVE_PRCTL) && defined(PR_SET_DUMPABLE)
+ /* this applies to Linux 2.4+ */
+#ifdef AP_MPM_WANT_SET_COREDUMPDIR
+ if (ap_coredumpdir_configured) {
+ if (prctl(PR_SET_DUMPABLE, 1)) {
+ ap_log_error(APLOG_MARK, APLOG_ALERT, errno, NULL,
+ "set dumpable failed - this child will not coredump"
+ " after software errors");
+ }
+ }
+#endif
+#endif
+#endif
+ return 0;
+}
+
Modified: httpd/httpd/trunk/os/unix/unixd.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/os/unix/unixd.c?rev=711146&r1=711145&r2=711146&view=diff
==============================================================================
--- httpd/httpd/trunk/os/unix/unixd.c (original)
+++ httpd/httpd/trunk/os/unix/unixd.c Mon Nov 3 16:44:56 2008
@@ -52,212 +52,6 @@
unixd_config_rec unixd_config;
-/* Set group privileges.
- *
- * Note that we use the username as set in the config files, rather than
- * the lookup of to uid --- the same uid may have multiple passwd entries,
- * with different sets of groups for each.
- */
-
-static int set_group_privs(void)
-{
- if (!geteuid()) {
- const char *name;
-
- /* Get username if passed as a uid */
-
- if (unixd_config.user_name[0] == '#') {
- struct passwd *ent;
- uid_t uid = atol(&unixd_config.user_name[1]);
-
- if ((ent = getpwuid(uid)) == NULL) {
- ap_log_error(APLOG_MARK, APLOG_ALERT, errno, NULL,
- "getpwuid: couldn't determine user name from uid %ld, "
- "you probably need to modify the User directive",
- (long)uid);
- return -1;
- }
-
- name = ent->pw_name;
- }
- else
- name = unixd_config.user_name;
-
-#if !defined(OS2) && !defined(TPF)
- /* OS/2 and TPF don't support groups. */
-
- /*
- * Set the GID before initgroups(), since on some platforms
- * setgid() is known to zap the group list.
- */
- if (setgid(unixd_config.group_id) == -1) {
- ap_log_error(APLOG_MARK, APLOG_ALERT, errno, NULL,
- "setgid: unable to set group id to Group %u",
- (unsigned)unixd_config.group_id);
- return -1;
- }
-
- /* Reset `groups' attributes. */
-
- if (initgroups(name, unixd_config.group_id) == -1) {
- ap_log_error(APLOG_MARK, APLOG_ALERT, errno, NULL,
- "initgroups: unable to set groups for User %s "
- "and Group %u", name, (unsigned)unixd_config.group_id);
- return -1;
- }
-#endif /* !defined(OS2) && !defined(TPF) */
- }
- return 0;
-}
-
-
-AP_DECLARE(int) unixd_setup_child(void)
-{
- if (set_group_privs()) {
- return -1;
- }
-
- if (NULL != unixd_config.chroot_dir) {
- if (geteuid()) {
- ap_log_error(APLOG_MARK, APLOG_ALERT, errno, NULL,
- "Cannot chroot when not started as root");
- return -1;
- }
- if (chdir(unixd_config.chroot_dir) != 0) {
- ap_log_error(APLOG_MARK, APLOG_ALERT, errno, NULL,
- "Can't chdir to %s", unixd_config.chroot_dir);
- return -1;
- }
- if (chroot(unixd_config.chroot_dir) != 0) {
- ap_log_error(APLOG_MARK, APLOG_ALERT, errno, NULL,
- "Can't chroot to %s", unixd_config.chroot_dir);
- return -1;
- }
- if (chdir("/") != 0) {
- ap_log_error(APLOG_MARK, APLOG_ALERT, errno, NULL,
- "Can't chdir to new root");
- return -1;
- }
- }
-
-#ifdef MPE
- /* Only try to switch if we're running as MANAGER.SYS */
- if (geteuid() == 1 && unixd_config.user_id > 1) {
- GETPRIVMODE();
- if (setuid(unixd_config.user_id) == -1) {
- GETUSERMODE();
- ap_log_error(APLOG_MARK, APLOG_ALERT, errno, NULL,
- "setuid: unable to change to uid: %ld",
- (long) unixd_config.user_id);
- exit(1);
- }
- GETUSERMODE();
- }
-#else
- /* Only try to switch if we're running as root */
- if (!geteuid() && (
-#ifdef _OSD_POSIX
- os_init_job_environment(NULL, unixd_config.user_name, ap_exists_config_define("DEBUG")) != 0 ||
-#endif
- setuid(unixd_config.user_id) == -1)) {
- ap_log_error(APLOG_MARK, APLOG_ALERT, errno, NULL,
- "setuid: unable to change to uid: %ld",
- (long) unixd_config.user_id);
- return -1;
- }
-#if defined(HAVE_PRCTL) && defined(PR_SET_DUMPABLE)
- /* this applies to Linux 2.4+ */
-#ifdef AP_MPM_WANT_SET_COREDUMPDIR
- if (ap_coredumpdir_configured) {
- if (prctl(PR_SET_DUMPABLE, 1)) {
- ap_log_error(APLOG_MARK, APLOG_ALERT, errno, NULL,
- "set dumpable failed - this child will not coredump"
- " after software errors");
- }
- }
-#endif
-#endif
-#endif
- return 0;
-}
-
-
-AP_DECLARE(const char *) unixd_set_user(cmd_parms *cmd, void *dummy,
- const char *arg)
-{
- const char *err = ap_check_cmd_context(cmd, GLOBAL_ONLY);
- if (err != NULL) {
- return err;
- }
-
- unixd_config.user_name = arg;
- unixd_config.user_id = ap_uname2id(arg);
-#if !defined (BIG_SECURITY_HOLE) && !defined (OS2)
- if (unixd_config.user_id == 0) {
- return "Error:\tApache has not been designed to serve pages while\n"
- "\trunning as root. There are known race conditions that\n"
- "\twill allow any local user to read any file on the system.\n"
- "\tIf you still desire to serve pages as root then\n"
- "\tadd -DBIG_SECURITY_HOLE to the CFLAGS env variable\n"
- "\tand then rebuild the server.\n"
- "\tIt is strongly suggested that you instead modify the User\n"
- "\tdirective in your httpd.conf file to list a non-root\n"
- "\tuser.\n";
- }
-#endif
-
- return NULL;
-}
-
-AP_DECLARE(const char *) unixd_set_group(cmd_parms *cmd, void *dummy,
- const char *arg)
-{
- const char *err = ap_check_cmd_context(cmd, GLOBAL_ONLY);
- if (err != NULL) {
- return err;
- }
-
- unixd_config.group_id = ap_gname2id(arg);
-
- return NULL;
-}
-AP_DECLARE(const char *) unixd_set_chroot_dir(cmd_parms *cmd, void *dummy,
- const char *arg)
-{
- const char *err = ap_check_cmd_context(cmd, GLOBAL_ONLY);
- if (err != NULL) {
- return err;
- }
- if (!ap_is_directory(cmd->pool, arg)) {
- return "ChrootDir must be a valid directory";
- }
-
- unixd_config.chroot_dir = arg;
- return NULL;
-}
-
-AP_DECLARE(void) unixd_pre_config(apr_pool_t *ptemp)
-{
- apr_finfo_t wrapper;
-
- unixd_config.user_name = DEFAULT_USER;
- unixd_config.user_id = ap_uname2id(DEFAULT_USER);
- unixd_config.group_id = ap_gname2id(DEFAULT_GROUP);
-
- unixd_config.chroot_dir = NULL; /* none */
-
- /* Check for suexec */
- unixd_config.suexec_enabled = 0;
- if ((apr_stat(&wrapper, SUEXEC_BIN,
- APR_FINFO_NORM, ptemp)) != APR_SUCCESS) {
- return;
- }
-
- if ((wrapper.protection & APR_USETID) && wrapper.user == 0) {
- unixd_config.suexec_enabled = 1;
- }
-}
-
AP_DECLARE(void) unixd_set_rlimit(cmd_parms *cmd, struct rlimit **plimit,
const char *arg, const char * arg2, int type)
Modified: httpd/httpd/trunk/os/unix/unixd.h
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/os/unix/unixd.h?rev=711146&r1=711145&r2=711146&view=diff
==============================================================================
--- httpd/httpd/trunk/os/unix/unixd.h (original)
+++ httpd/httpd/trunk/os/unix/unixd.h Mon Nov 3 16:44:56 2008
@@ -80,15 +80,8 @@
} unixd_config_rec;
AP_DECLARE_DATA extern unixd_config_rec unixd_config;
-AP_DECLARE(int) unixd_setup_child(void);
-AP_DECLARE(void) unixd_pre_config(apr_pool_t *ptemp);
-AP_DECLARE(const char *) unixd_set_user(cmd_parms *cmd, void *dummy,
- const char *arg);
-AP_DECLARE(const char *) unixd_set_group(cmd_parms *cmd, void *dummy,
- const char *arg);
-AP_DECLARE(const char *) unixd_set_chroot_dir(cmd_parms *cmd, void *dummy,
- const char *arg);
-
+AP_DECLARE(int) unixd_setup_child(void); /* mod_cgid needs this */
+
#if defined(RLIMIT_CPU) || defined(RLIMIT_DATA) || defined(RLIMIT_VMEM) || defined(RLIMIT_NPROC) || defined(RLIMIT_AS)
AP_DECLARE(void) unixd_set_rlimit(cmd_parms *cmd, struct rlimit **plimit,
const char *arg, const char * arg2, int type);
Modified: httpd/httpd/trunk/server/mpm/experimental/event/event.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/mpm/experimental/event/event.c?rev=711146&r1=711145&r2=711146&view=diff
==============================================================================
--- httpd/httpd/trunk/server/mpm/experimental/event/event.c (original)
+++ httpd/httpd/trunk/server/mpm/experimental/event/event.c Mon Nov 3 16:44:56 2008
@@ -2358,7 +2358,6 @@
parent_pid = ap_my_pid = getpid();
}
- unixd_pre_config(ptemp);
ap_listen_pre_config();
ap_daemons_to_start = DEFAULT_START_DAEMON;
min_spare_threads = DEFAULT_MIN_FREE_DAEMON * DEFAULT_THREADS_PER_CHILD;
@@ -2718,7 +2717,6 @@
}
static const command_rec event_cmds[] = {
- UNIX_DAEMON_COMMANDS,
LISTEN_COMMANDS,
AP_INIT_TAKE1("StartServers", set_daemons_to_start, NULL, RSRC_CONF,
"Number of child processes launched at server startup"),
Modified: httpd/httpd/trunk/server/mpm/prefork/prefork.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/mpm/prefork/prefork.c?rev=711146&r1=711145&r2=711146&view=diff
==============================================================================
--- httpd/httpd/trunk/server/mpm/prefork/prefork.c (original)
+++ httpd/httpd/trunk/server/mpm/prefork/prefork.c Mon Nov 3 16:44:56 2008
@@ -1279,7 +1279,6 @@
parent_pid = ap_my_pid = getpid();
}
- unixd_pre_config(ptemp);
ap_listen_pre_config();
ap_daemons_to_start = DEFAULT_START_DAEMON;
ap_daemons_min_free = DEFAULT_MIN_FREE_DAEMON;
@@ -1498,7 +1497,6 @@
}
static const command_rec prefork_cmds[] = {
-UNIX_DAEMON_COMMANDS,
LISTEN_COMMANDS,
AP_INIT_TAKE1("StartServers", set_daemons_to_start, NULL, RSRC_CONF,
"Number of child processes launched at server startup"),
Modified: httpd/httpd/trunk/server/mpm/worker/worker.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/mpm/worker/worker.c?rev=711146&r1=711145&r2=711146&view=diff
==============================================================================
--- httpd/httpd/trunk/server/mpm/worker/worker.c (original)
+++ httpd/httpd/trunk/server/mpm/worker/worker.c Mon Nov 3 16:44:56 2008
@@ -1940,7 +1940,6 @@
parent_pid = ap_my_pid = getpid();
}
- unixd_pre_config(ptemp);
ap_listen_pre_config();
ap_daemons_to_start = DEFAULT_START_DAEMON;
min_spare_threads = DEFAULT_MIN_FREE_DAEMON * DEFAULT_THREADS_PER_CHILD;
@@ -2299,7 +2298,6 @@
}
static const command_rec worker_cmds[] = {
-UNIX_DAEMON_COMMANDS,
LISTEN_COMMANDS,
AP_INIT_TAKE1("StartServers", set_daemons_to_start, NULL, RSRC_CONF,
"Number of child processes launched at server startup"),
Re: svn commit: r711146 - in /httpd/httpd/trunk: modules/arch/unix/mod_unixd.c
os/unix/unixd.c os/unix/unixd.h server/mpm/experimental/event/event.c server/mpm/prefork/prefork.c
server/mpm/worker/worker.c
Posted by "William A. Rowe, Jr." <wr...@rowe-clan.net>.
Nick Kew wrote:
>
> The architectural reason is to pave the way for alternatives to
> mod_unixd, that can either work alongside it (additional functions)
> or replace it entirely (other platforms under simple MPM, or
> alternative security models such as perchild).
I would love to have the logic of thread/process credentials parked in
the arch/{plat}/ module, but can't see how perchild's strategy can
realistically be satisfied by a simple mpm ;-)
In any case, thanks for all the effort on this! It very much mirrors
the "hackery" on win32 that I isolated into mod_win32.c - and we can
surely align such things.
Re: svn commit: r711146 - in /httpd/httpd/trunk:
modules/arch/unix/mod_unixd.c os/unix/unixd.c os/unix/unixd.h
server/mpm/experimental/event/event.c server/mpm/prefork/prefork.c
server/mpm/worker/worker.c
Posted by Nick Kew <ni...@webthing.com>.
On Wed, 5 Nov 2008 10:37:48 -0500
Jim Jagielski <ji...@jaguNET.com> wrote:
> So a single module exists for basically 1 function which implements
> a single hook? And none of the other tasks in unixd.c are hook
> suitable?
They may be. I anticipate further review in due course.
Feel free to hack it if you have your own ideas, or just don't
want to wait.
> I still fail to see the architectural reason... My fear is that
> without a clear reason for what should be in either, we're just
> adding complexity.
The architectural reason is to pave the way for alternatives to
mod_unixd, that can either work alongside it (additional functions)
or replace it entirely (other platforms under simple MPM, or
alternative security models such as perchild).
--
Nick Kew
Application Development with Apache - the Apache Modules Book
http://www.apachetutor.org/
Re: svn commit: r711146 - in /httpd/httpd/trunk: modules/arch/unix/mod_unixd.c os/unix/unixd.c os/unix/unixd.h server/mpm/experimental/event/event.c server/mpm/prefork/prefork.c server/mpm/worker/worker.c
Posted by Jim Jagielski <ji...@jaguNET.com>.
On Nov 5, 2008, at 5:17 AM, Nick Kew wrote:
>
> On 4 Nov 2008, at 21:14, Jim Jagielski wrote:
>
>>
>> On Nov 3, 2008, at 7:44 PM, niq@apache.org wrote:
>>
>>> Author: niq
>>> Date: Mon Nov 3 16:44:56 2008
>>> New Revision: 711146
>>>
>>> URL: http://svn.apache.org/viewvc?rev=711146&view=rev
>>> Log:
>>> Further unixd hacks to remove duplication between old-unixd and
>>> mod_unixd,
>>> and get it working with old MPMS[1] + mod_unixd. It's still an
>>> uneasy
>>> split, as some modules (mod_cgid, suexec)[2] also use unixd.
>>> More thinking+hacking due.
>>>
>>> [1] Should be prefork/worker/event, but only worker is tested.
>>> [2] cgid is OK, suexec is untested.
>>>
>>
>> I was playing around with avoiding the overlap we have a unix.h
>> which somewhat-matches stuff in mod_unixd.c (I was doing this
>> to create a mod_unixd.h) but this started getting screwy fast.
>>
>> What, exactly, do we want the functional and architectural
>> differences between unixd.c and mod_unixd.c to be??
>
> The old unixd felt like a pot-pourri. The new mod_unixd
> attempts to focus on a single task, now called drop_privileges.
> We don't have a clean break, 'cos I've been lazy and left the
> unixd config as-is, including the is-suexec-enabled flag which
> doesn't really belong in mod_unixd.
>
> Apart from that, what remains in os/unix is just whatever doesn't
> belong in mod_unixd.
>
So a single module exists for basically 1 function which implements
a single hook? And none of the other tasks in unixd.c are hook
suitable?
I still fail to see the architectural reason... My fear is that
without a clear reason for what should be in either, we're just
adding complexity.
Re: svn commit: r711146 - in /httpd/httpd/trunk: modules/arch/unix/mod_unixd.c os/unix/unixd.c os/unix/unixd.h server/mpm/experimental/event/event.c server/mpm/prefork/prefork.c server/mpm/worker/worker.c
Posted by Nick Kew <ni...@webthing.com>.
On 4 Nov 2008, at 21:14, Jim Jagielski wrote:
>
> On Nov 3, 2008, at 7:44 PM, niq@apache.org wrote:
>
>> Author: niq
>> Date: Mon Nov 3 16:44:56 2008
>> New Revision: 711146
>>
>> URL: http://svn.apache.org/viewvc?rev=711146&view=rev
>> Log:
>> Further unixd hacks to remove duplication between old-unixd and
>> mod_unixd,
>> and get it working with old MPMS[1] + mod_unixd. It's still an
>> uneasy
>> split, as some modules (mod_cgid, suexec)[2] also use unixd.
>> More thinking+hacking due.
>>
>> [1] Should be prefork/worker/event, but only worker is tested.
>> [2] cgid is OK, suexec is untested.
>>
>
> I was playing around with avoiding the overlap we have a unix.h
> which somewhat-matches stuff in mod_unixd.c (I was doing this
> to create a mod_unixd.h) but this started getting screwy fast.
>
> What, exactly, do we want the functional and architectural
> differences between unixd.c and mod_unixd.c to be??
The old unixd felt like a pot-pourri. The new mod_unixd
attempts to focus on a single task, now called drop_privileges.
We don't have a clean break, 'cos I've been lazy and left the
unixd config as-is, including the is-suexec-enabled flag which
doesn't really belong in mod_unixd.
Apart from that, what remains in os/unix is just whatever doesn't
belong in mod_unixd.
--
Nick Kew
Re: svn commit: r711146 - in /httpd/httpd/trunk: modules/arch/unix/mod_unixd.c
os/unix/unixd.c os/unix/unixd.h server/mpm/experimental/event/event.c server/mpm/prefork/prefork.c
server/mpm/worker/worker.c
Posted by "William A. Rowe, Jr." <wr...@rowe-clan.net>.
Jim Jagielski wrote:
>
> I was playing around with avoiding the overlap we have a unix.h
> which somewhat-matches stuff in mod_unixd.c (I was doing this
> to create a mod_unixd.h) but this started getting screwy fast.
>
> What, exactly, do we want the functional and architectural
> differences between unixd.c and mod_unixd.c to be??
And it begs the question I asked about 3/4 of a day ago on #httpd-dev
...
is it time to axe httpd-[rev]/os/ ??
(... unix/ ... win32/ ... etc)
I suspect this is time. Autoconf is supposed to resolve all of that
headache for us, and with a new cmake pragma it should also be totally
irrelevant.
Re: svn commit: r711146 - in /httpd/httpd/trunk: modules/arch/unix/mod_unixd.c os/unix/unixd.c os/unix/unixd.h server/mpm/experimental/event/event.c server/mpm/prefork/prefork.c server/mpm/worker/worker.c
Posted by Jim Jagielski <ji...@jaguNET.com>.
On Nov 3, 2008, at 7:44 PM, niq@apache.org wrote:
> Author: niq
> Date: Mon Nov 3 16:44:56 2008
> New Revision: 711146
>
> URL: http://svn.apache.org/viewvc?rev=711146&view=rev
> Log:
> Further unixd hacks to remove duplication between old-unixd and
> mod_unixd,
> and get it working with old MPMS[1] + mod_unixd. It's still an uneasy
> split, as some modules (mod_cgid, suexec)[2] also use unixd.
> More thinking+hacking due.
>
> [1] Should be prefork/worker/event, but only worker is tested.
> [2] cgid is OK, suexec is untested.
>
I was playing around with avoiding the overlap we have a unix.h
which somewhat-matches stuff in mod_unixd.c (I was doing this
to create a mod_unixd.h) but this started getting screwy fast.
What, exactly, do we want the functional and architectural
differences between unixd.c and mod_unixd.c to be??