VladPolskiy/apache-http-server
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2025-08-03 16:33:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

OS/2: Put back creation of listeners in main thread in spmt_os2 MPM.

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85856 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Brian Havard
2000-07-16 07:12:42 +00:00
parent 7a357441ab
commit 1610c8d4f5
3 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/ap_listen.h
View File

@ -73,7 +73,7 @@ struct ap_listen_rec {
extern ap_listen_rec *ap_listeners;
void ap_listen_pre_config(void);
#if !defined(WIN32) && !defined(PREFORK_MPM)
#if !defined(WIN32) && !defined(PREFORK_MPM) && !defined(SPMT_OS2_MPM)
int ap_setup_listeners(server_rec *s);
#else
int ap_listen_open(process_rec *process, unsigned port);

2
server/listen.c
View File

@ -202,7 +202,7 @@ static void alloc_listener(process_rec *process, char *addr, unsigned int port)
ap_listeners = new;
}
#if !defined(WIN32) && !defined(PREFORK_MPM)
#if !defined(WIN32) && !defined(PREFORK_MPM) && !defined(SPMT_OS2_MPM)
static
#endif
int ap_listen_open(process_rec *process, unsigned port)

6
server/mpm/spmt_os2/spmt_os2.c
View File

@ -1188,6 +1188,12 @@ int ap_mpm_run(ap_pool_t *_pconf, ap_pool_t *plog, server_rec *s)
ap_server_conf = s;
ap_log_pid(pconf, ap_pid_fname);
if ((status = ap_listen_open(s->process, s->port)) != APR_SUCCESS) {
ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ALERT, status, s,
"no listening sockets available, shutting down");
return -1;
}
SAFE_ACCEPT(accept_mutex_init(pconf));
if (!is_graceful) {