changeset: 85380:3f30c281eb1c branch: 2.7 parent: 85376:1cd24ea5abeb user: Christian Heimes date: Sun Aug 25 14:19:16 2013 +0200 files: Misc/NEWS Modules/_ssl.c description: Issue #18747: Fix spelling errors in my commit message and comments, thanks to Vajrasky Kok for proof-reading. diff -r 1cd24ea5abeb -r 3f30c281eb1c Misc/NEWS --- a/Misc/NEWS Sun Aug 25 14:12:41 2013 +0200 +++ b/Misc/NEWS Sun Aug 25 14:19:16 2013 +0200 @@ -44,7 +44,7 @@ module will be called in a deterministic order. - 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 -r 1cd24ea5abeb -r 3f30c281eb1c Modules/_ssl.c --- a/Modules/_ssl.c Sun Aug 25 14:12:41 2013 +0200 +++ b/Modules/_ssl.c Sun Aug 25 14:19:16 2013 +0200 @@ -1629,7 +1629,7 @@ /* 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. @@ -1638,7 +1638,7 @@ * 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. */