From 0f34844009075391c55419a3afb90e469facf35e Mon Sep 17 00:00:00 2001 From: Graham Dumpleton Date: Tue, 14 May 2019 16:14:07 +1000 Subject: [PATCH] Changed functions to pre/post actions when forking. --- src/server/mod_wsgi.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/src/server/mod_wsgi.c b/src/server/mod_wsgi.c index 2e4bb24..bf55945 100644 --- a/src/server/mod_wsgi.c +++ b/src/server/mod_wsgi.c @@ -4345,8 +4345,13 @@ static void wsgi_python_child_init(apr_pool_t *p) * do it if Python was initialised in parent process. */ - if (wsgi_python_initialized && !wsgi_python_after_fork) + if (wsgi_python_initialized && !wsgi_python_after_fork) { +#if PY_MAJOR_VERSION > 3 || (PY_MAJOR_VERSION == 3 && PY_MINOR_VERSION >= 7) + PyOS_AfterFork_Child(); +#else PyOS_AfterFork(); +#endif + } /* Finalise any Python objects required by child process. */ @@ -10422,6 +10427,12 @@ static int wsgi_start_process(apr_pool_t *p, WSGIDaemonProcess *daemon) wsgi_exit_daemon_process(0); } + if (wsgi_python_initialized) { +#if PY_MAJOR_VERSION > 3 || (PY_MAJOR_VERSION == 3 && PY_MINOR_VERSION >= 7) + PyOS_AfterFork_Parent(); +#endif + } + apr_pool_note_subprocess(p, &daemon->process, APR_KILL_AFTER_TIMEOUT); apr_proc_other_child_register(&daemon->process, wsgi_manage_process, daemon, NULL, p);