www/apache
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2025-08-08 15:02:10 +03:00
Code Activity

Revert r547987 ("svn merge -c -547987 .")

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@551835 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Joe Orton
2007-06-29 09:31:11 +00:00
parent 8e9aeb9919
commit ada9c28dcf
18 changed files with 16 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
server/mpm/mpmt_os2/mpmt_os2.c
View File

@@ -281,7 +281,6 @@ static char master_main()
#endif
if (one_process) {
ap_scoreboard_image->parent[0].pid = getpid();
ap_set_pid_table(getpid());
ap_mpm_child_main(pconf);
return FALSE;
}
@@ -308,7 +307,6 @@ static char master_main()
rc = DosWaitChild(DCWA_PROCESSTREE, DCWW_NOWAIT, &proc_rc, &child_pid, 0);
if (rc == 0) {
ap_unset_pid_table(child_pid);
/* A child has terminated, remove its scoreboard entry & terminate if necessary */
for (slot=0; ap_scoreboard_image->parent[slot].pid != child_pid && slot < HARD_SERVER_LIMIT; slot++);
@@ -332,13 +330,7 @@ static char master_main()
/* Signal children to shut down, either gracefully or immediately */
for (slot=0; slot<HARD_SERVER_LIMIT; slot++) {
PID pid;
pid = ap_scoreboard_image->parent[n].pid;
if (ap_in_pid_table(pid)) {
kill(pid, is_graceful ? SIGHUP : SIGTERM);
ap_unset_pid_table(pid);
}
kill(ap_scoreboard_image->parent[slot].pid, is_graceful ? SIGHUP : SIGTERM);
}
DosFreeMem(parent_info);
@@ -372,7 +364,6 @@ static void spawn_child(int slot)
}
ap_scoreboard_image->parent[slot].pid = proc_rc.codeTerminate;
ap_set_pid_table(proc_rc.codeTerminate);
}