summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Heimes <christian@cheimes.de>2013-08-25 12:19:16 (GMT)
committerChristian Heimes <christian@cheimes.de>2013-08-25 12:19:16 (GMT)
commit61636e7105bac4753f6796834b899ad30aeee492 (patch)
tree60ecd3f3b92533d44e5da7d95bdeea9003a95df6
parent157c9834b40ab202caa650735435410f9225df12 (diff)
downloadcpython-61636e7105bac4753f6796834b899ad30aeee492.zip
cpython-61636e7105bac4753f6796834b899ad30aeee492.tar.gz
cpython-61636e7105bac4753f6796834b899ad30aeee492.tar.bz2
Issue #18747: Fix spelling errors in my commit message and comments,
thanks to Vajrasky Kok for proof-reading.
-rw-r--r--Misc/NEWS2
-rw-r--r--Modules/_ssl.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/Misc/NEWS b/Misc/NEWS
index 81ad8f5..62e9078 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 97934d9..82d0a6a 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.
*/