Commit 98116826 authored by Jeff Trawick's avatar Jeff Trawick
Browse files

allow non-Unix MPMs to use mpm_common.c by not automatically 

building in Unix-specific code


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90137 13f79535-47bb-0310-9956-ffa450edef68
parent f2e4507f

configure.in

+2 −0
Original line number Diff line number Diff line
@@ -202,6 +202,8 @@ dnl ## Check for library functions 
dnl See Comment #Spoon



AC_CHECK_FUNCS( \

getpwnam \

getgrnam \

initgroups \

bindprocessor \

)

include/mpm_common.h

+5 −0
Original line number Diff line number Diff line
@@ -124,7 +124,9 @@ void ap_reclaim_child_processes(int terminate); 
 * @param ret The process id of the process that died

 * @param p The pool to allocate out of

 */

#ifdef AP_MPM_WANT_WAIT_OR_TIMEOUT

void ap_wait_or_timeout(apr_wait_t *status, apr_proc_t *ret, apr_pool_t *p);

#endif



/**

 * Log why a child died to the error log, if the child died without the
@@ -132,7 +134,9 @@ void ap_wait_or_timeout(apr_wait_t *status, apr_proc_t *ret, apr_pool_t *p); 
 * @param pid The child that has died

 * @param status The status returned from ap_wait_or_timeout

 */

#ifdef AP_MPM_WANT_PROCESS_CHILD_STATUS

void ap_process_child_status(apr_proc_t *pid, apr_wait_t status);

#endif



#if defined(TCP_NODELAY) && !defined(MPE) && !defined(TPF)

/**
@@ -154,6 +158,7 @@ void ap_sock_disable_nagle(apr_socket_t *s); 
 * @deffunc uid_t ap_uname2id(const char *name)

 */

AP_DECLARE(uid_t) ap_uname2id(const char *name);



/**

 * Convert a group name to a numeric ID

 * @param name The name to convert

server/mpm/beos/mpm.h

+2 −0
Original line number Diff line number Diff line
@@ -68,6 +68,8 @@ 
#define MPM_CHILD_PID(i) (ap_scoreboard_image->servers[0][i].tid)

#define MPM_NOTE_CHILD_KILLED(i) (MPM_CHILD_PID(i) = 0)



#define AP_MPM_WANT_WAIT_OR_TIMEOUT

#define AP_MPM_WANT_PROCESS_CHILD_STATUS

#define AP_MPM_WANT_SET_PIDFILE

#define AP_MPM_WANT_SET_SCOREBOARD

#define AP_MPM_WANT_SET_MAX_REQUESTS

server/mpm/experimental/perchild/mpm.h

+2 −0
Original line number Diff line number Diff line
@@ -67,6 +67,8 @@ 


#define MPM_NAME "Perchild"



#define AP_MPM_WANT_WAIT_OR_TIMEOUT

#define AP_MPM_WANT_PROCESS_CHILD_STATUS

#define AP_MPM_WANT_SET_PIDFILE

#define AP_MPM_WANT_SET_SCOREBOARD

#define AP_MPM_WANT_SET_LOCKFILE

server/mpm/perchild/mpm.h

+2 −0
Original line number Diff line number Diff line
@@ -67,6 +67,8 @@ 


#define MPM_NAME "Perchild"



#define AP_MPM_WANT_WAIT_OR_TIMEOUT

#define AP_MPM_WANT_PROCESS_CHILD_STATUS

#define AP_MPM_WANT_SET_PIDFILE

#define AP_MPM_WANT_SET_SCOREBOARD

#define AP_MPM_WANT_SET_LOCKFILE