From: Christian Heimes Date: Sun, 25 Aug 2013 12:19:16 +0000 (+0200) Subject: Issue #18747: Fix spelling errors in my commit message and comments, X-Git-Tag: v3.4.0a2~121^2 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=61636e7105bac4753f6796834b899ad30aeee492;p=thirdparty%2FPython%2Fcpython.git Issue #18747: Fix spelling errors in my commit message and comments, thanks to Vajrasky Kok for proof-reading. --- diff --git a/Misc/NEWS b/Misc/NEWS index 81ad8f5d8fc9..62e90788c961 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -84,7 +84,7 @@ Library in the tkinter module. - Issue #18747: Re-seed OpenSSL's pseudo-random number generator after fork. - A pthread_atfork() parent handler is used to seeded the PRNG with pid, time + A pthread_atfork() parent handler is used to seed the PRNG with pid, time and some stack data. - Issue #8865: Concurrent invocation of select.poll.poll() now raises a diff --git a/Modules/_ssl.c b/Modules/_ssl.c index 97934d917131..82d0a6a29bee 100644 --- a/Modules/_ssl.c +++ b/Modules/_ssl.c @@ -2586,7 +2586,7 @@ fails or if it does not provide enough data to seed PRNG."); /* Seed OpenSSL's PRNG at fork(), http://bugs.python.org/issue18747 * * The parent handler seeds the PRNG from pseudo-random data like pid, the - * current time (miliseconds or seconds) and an uninitialized arry. + * current time (miliseconds or seconds) and an uninitialized array. * The array contains stack variables that are impossible to predict * on most systems, e.g. function return address (subject to ASLR), the * stack protection canary and automatic variables. @@ -2595,7 +2595,7 @@ fails or if it does not provide enough data to seed PRNG."); * Note: * The code uses pthread_atfork() until Python has a proper atfork API. The * handlers are not removed from the child process. A parent handler is used - * instead of a child handler because fork() is suppose to be async-signal + * instead of a child handler because fork() is supposed to be async-signal * safe but the handler calls unsafe functions. */