]> granicus.if.org Git - apache/commit
Merge r1822537, r1830744 from trunk:
authorYann Ylavic <ylavic@apache.org>
Wed, 6 Jun 2018 10:53:16 +0000 (10:53 +0000)
committerYann Ylavic <ylavic@apache.org>
Wed, 6 Jun 2018 10:53:16 +0000 (10:53 +0000)
commitaeeca6f809632755a87f82ab188612ce441c0b03
treee1745dd47c9b1ae223998e8e1d3360f8e529f50d
parent2d4e2103565fd4336834bc3a4f4705ff61957e09
Merge r1822537, r1830744 from trunk:

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

We can't destroy ap_pglobal in the MPMs because clean_child_exit() runs in
a DSO which would be unloaded under us.

So we defer an ap_terminate() with atexit() in ap_unixd_mpm_set_signals(),
all this is static/builtin code in "os/unix/unixd.c".

Follow up to r1822537: replace static variable with pool userdata.

Also adds a comment and a CHANGES entry.

Submitted by: ylavic
Reviewed by: ylavic, jim, icing

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1833005 13f79535-47bb-0310-9956-ffa450edef68
CHANGES
os/unix/unixd.c