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

Restarts were hosed after the APR changes because we were opening

Browse Source 
sockets even when we had them open already. So, for now, add an "active"
flag that indicates whether the socket stored in the listen_rec is an
actual open socket yet.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@83918 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Manoj Kasichainula
1999-09-24 22:01:21 +00:00
parent 76eaf4d395
commit 9686424b64
2 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/ap_listen.h
View File

@ -64,6 +64,7 @@ typedef struct ap_listen_rec ap_listen_rec;
struct ap_listen_rec { struct ap_listen_rec {
ap_listen_rec *next; ap_listen_rec *next;
ap_socket_t *sd; ap_socket_t *sd;
int active;
/* more stuff here, like which protocol is bound to the port */ /* more stuff here, like which protocol is bound to the port */
}; };

16
server/listen.c
View File

@ -134,6 +134,7 @@ static ap_status_t make_sock(ap_context_t *p, ap_listen_rec *server)
} }
server->sd = s; server->sd = s;
server->active = 1;
return APR_SUCCESS; return APR_SUCCESS;
} }
@ -144,6 +145,7 @@ static ap_status_t close_listeners_on_exec(void *v)
for (lr = ap_listeners; lr; lr = lr->next) { for (lr = ap_listeners; lr; lr = lr->next) {
ap_close_socket(lr->sd); ap_close_socket(lr->sd);
lr->active = 0;
} }
return APR_SUCCESS; return APR_SUCCESS;
} }
@ -171,7 +173,9 @@ static void alloc_listener(char *addr, unsigned int port)
} }
/* this has to survive restarts */ /* this has to survive restarts */
/* XXX - We need to deal with freeing this structure properly. */
new = malloc(sizeof(ap_listen_rec)); new = malloc(sizeof(ap_listen_rec));
new->active = 0;
if (ap_create_tcp_socket(NULL, &new->sd) != APR_SUCCESS) { if (ap_create_tcp_socket(NULL, &new->sd) != APR_SUCCESS) {
ap_log_error(APLOG_MARK, APLOG_CRIT, NULL, ap_log_error(APLOG_MARK, APLOG_CRIT, NULL,
"make_sock: failed to get a socket for %s", addr); "make_sock: failed to get a socket for %s", addr);
@ -189,7 +193,7 @@ int ap_listen_open(ap_context_t *pconf, unsigned port)
ap_listen_rec *lr; ap_listen_rec *lr;
ap_listen_rec *next; ap_listen_rec *next;
int num_open; int num_open;
ap_status_t stat;
/* allocate a default listener if necessary */ /* allocate a default listener if necessary */
if (ap_listeners == NULL) { if (ap_listeners == NULL) {
alloc_listener(APR_ANYADDR, port ? port : DEFAULT_HTTP_PORT); alloc_listener(APR_ANYADDR, port ? port : DEFAULT_HTTP_PORT);
@ -197,15 +201,21 @@ int ap_listen_open(ap_context_t *pconf, unsigned port)
num_open = 0; num_open = 0;
for (lr = ap_listeners; lr; lr = lr->next) { for (lr = ap_listeners; lr; lr = lr->next) {
stat = make_sock(pconf, lr); if (lr->active) {
if (stat == APR_SUCCESS) {
++num_open; ++num_open;
} }
else {
if (make_sock(pconf, lr) == APR_SUCCESS) {
++num_open;
lr->active = 1;
}
}
} }
/* close the old listeners */ /* close the old listeners */
for (lr = old_listeners; lr; lr = next) { for (lr = old_listeners; lr; lr = next) {
ap_close_socket(lr->sd); ap_close_socket(lr->sd);
lr->active = 0;
next = lr->next; next = lr->next;
/* free(lr);*/ /* free(lr);*/
} }