diff options
| author | Yann Ylavic <ylavic@apache.org> | 2022-01-25 20:16:03 +0000 |
|---|---|---|
| committer | Yann Ylavic <ylavic@apache.org> | 2022-01-25 20:16:03 +0000 |
| commit | a3d78aae6ed5859177f225775a78e0c57f9aaa34 (patch) | |
| tree | 67e73d69ee1be870984b68c1fb9d19fc5e88a264 /threadproc/unix/proc.c | |
| parent | bd96cb9ad7724d0b55574466bcd09fb42ba6d3d7 (diff) | |
| download | apr-a3d78aae6ed5859177f225775a78e0c57f9aaa34.tar.gz | |
apr_thread: Follow up to r1897207: Provide apr_thread_current_after_fork().
thread_local variables are not (always?) reset on fork(), so APR (and the
user) needs a way to set the current_thread to NULL.
Use apr_thread_current_after_fork() in apr_proc_fork()'s child process.
Merge r1897470 from trunk.
Submitted by: ylavic
Reviewed by: ylavic
git-svn-id: https://svn.apache.org/repos/asf/apr/apr/branches/1.8.x@1897471 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'threadproc/unix/proc.c')
| -rw-r--r-- | threadproc/unix/proc.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/threadproc/unix/proc.c b/threadproc/unix/proc.c index 004772ff8..553d2578d 100644 --- a/threadproc/unix/proc.c +++ b/threadproc/unix/proc.c @@ -226,6 +226,9 @@ APR_DECLARE(apr_status_t) apr_proc_fork(apr_proc_t *proc, apr_pool_t *pool) return errno; } else if (pid == 0) { +#if AP_HAS_THREAD_LOCAL + apr_thread_current_after_fork(); +#endif proc->pid = getpid(); apr_random_after_fork(proc); |