www/apache
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2026-01-06 09:01:14 +03:00
Code Activity

Follow up to r1833368: apr_crypto_prng_after_fork() now used a PID.

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1833383 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Yann Ylavic
2018-06-12 08:01:04 +00:00
parent 5c072450ac
commit 2cbd1d0222
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
server/core.c
View File

@@ -5455,10 +5455,14 @@ static void core_child_init(apr_pool_t *pchild, server_rec *s)
/* The MPMs use plain fork() and not apr_proc_fork(), so we have to
* take care of the random generator manually in the child.
*/
#if USE_APR_CRYPTO_PRNG
apr_crypto_prng_after_fork();
#else
apr_proc_t proc;
memset(&proc, 0, sizeof(proc));
proc.pid = getpid();
#if USE_APR_CRYPTO_PRNG
apr_crypto_prng_after_fork(&proc);
#else
#if APR_HAS_THREADS
int threaded_mpm;
if (ap_mpm_query(AP_MPMQ_IS_THREADED, &threaded_mpm) == APR_SUCCESS
@@ -5466,9 +5470,8 @@ static void core_child_init(apr_pool_t *pchild, server_rec *s)
{
apr_thread_mutex_create(&rng_mutex, APR_THREAD_MUTEX_DEFAULT, pchild);
}
proc.pid = getpid();
apr_random_after_fork(&proc);
#endif
apr_random_after_fork(&proc);
#endif /* USE_APR_CRYPTO_PRNG */
}