Commit 1ef4ce73 authored by Yann Ylavic's avatar Yann Ylavic
Browse files

mpm_unix(es): cleanup properly on exit in one_process mode. 

We can destroy ap_pglobal because clean_child_exit() runs in DSO which would be
unloaded under us, so use atexit() to differ the final apr_terminate().



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

server/mpm/event/event.c

+1 −0
Original line number Diff line number Diff line
@@ -732,6 +732,7 @@ static void clean_child_exit(int code) 


    if (one_process) {

        event_note_child_killed(/* slot */ 0, 0, 0);

        atexit(apr_terminate);

    }



    exit(code);

server/mpm/prefork/prefork.c

+1 −0
Original line number Diff line number Diff line
@@ -230,6 +230,7 @@ static void clean_child_exit(int code) 


    if (one_process) {

        prefork_note_child_killed(/* slot */ 0, 0, 0);

        atexit(apr_terminate);

    }



    ap_mpm_pod_close(my_bucket->pod);

server/mpm/worker/worker.c

+1 −0
Original line number Diff line number Diff line
@@ -436,6 +436,7 @@ static void clean_child_exit(int code) 


    if (one_process) {

        worker_note_child_killed(/* slot */ 0, 0, 0);

        atexit(apr_terminate);

    }



    exit(code);