diff options
| author | Bradley Nicholes <bnicholes@apache.org> | 2002-03-14 16:48:19 +0000 |
|---|---|---|
| committer | Bradley Nicholes <bnicholes@apache.org> | 2002-03-14 16:48:19 +0000 |
| commit | da65586a945e9bf6738f3761830895b8317e429f (patch) | |
| tree | 5be4ac118aa6d42053e83b8838ad8fa647bcb9be /server | |
| parent | 9813433685be495ffa91d04917869806da59bcd1 (diff) | |
| download | httpd-da65586a945e9bf6738f3761830895b8317e429f.tar.gz | |
Added code to extract the current address space name so that each
instance of Apache can be identified by the address space that it is running in
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93934 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'server')
| -rw-r--r-- | server/mpm/netware/mpm_netware.c | 19 |
1 files changed, 16 insertions, 3 deletions
diff --git a/server/mpm/netware/mpm_netware.c b/server/mpm/netware/mpm_netware.c index 8256a3b7f3..c1b45d1b30 100644 --- a/server/mpm/netware/mpm_netware.c +++ b/server/mpm/netware/mpm_netware.c @@ -172,6 +172,7 @@ static apr_pool_t *pconf; /* Pool for config stuff */ static apr_pool_t *pmain; /* Pool for httpd child stuff */ static pid_t ap_my_pid; /* it seems silly to call getpid all the time */ +static char *ap_my_addrspace = NULL; static int die_now = 0; @@ -806,7 +807,10 @@ static void show_server_data() ap_listen_rec *lr; module **m; - printf("%s ID: %d\n", ap_get_server_version(), getpid()); + printf("%s\n", ap_get_server_version()); + if (ap_my_addrspace && (ap_my_addrspace[0] != 'O') && (ap_my_addrspace[1] != 'S')) + printf(" Running in address space %s\n", ap_my_addrspace); + /* Display listening ports */ printf(" Listening on port(s):"); @@ -957,14 +961,24 @@ int ap_mpm_run(apr_pool_t *_pconf, apr_pool_t *plog, server_rec *s) return 0; } +/* GetCurrentAddressSpace - this should be replaced with the correct header file when available! */ +struct _BogusAddressSpace { int a; int b; int c; char name[]; }; +typedef struct _BogusAddressSpace BogusAddressSpace; +extern BogusAddressSpace* GetCurrentAddressSpace(void); +/* GetCurrentAddressSpace */ + static int netware_pre_config(apr_pool_t *p, apr_pool_t *plog, apr_pool_t *ptemp) { int debug; + BogusAddressSpace *addrspace = NULL; debug = ap_exists_config_define("DEBUG"); is_graceful = 0; ap_my_pid = getpid(); + addrspace = GetCurrentAddressSpace(); + if (addrspace) + ap_my_addrspace = apr_pstrdup (p, addrspace->name); ap_listen_pre_config(); ap_threads_to_start = DEFAULT_START_THREADS; @@ -1046,7 +1060,6 @@ void netware_rewrite_args(process_rec *process) } } - static int CommandLineInterpreter(scr_t screenID, const char *commandLine) { char *szCommand = "APACHE2 "; @@ -1077,7 +1090,7 @@ static int CommandLineInterpreter(scr_t screenID, const char *commandLine) /* If we got an instance id but it doesn't match this instance of the nlm, pass it on. */ - if (pID && (atoi(&pID[2]) != getpid())) + if (pID && ap_my_addrspace && strnicmp(&pID[2], ap_my_addrspace, strlen(ap_my_addrspace))) return NOTMYCOMMAND; /* If we have determined that this command belongs to this |