[Python-checkins] cpython (merge 3.2 -> default): Clarify that ssl.OP_ALL can be different from OpenSSL's SSL_OP_ALL.

[antoine.pitrou]

http://hg.python.org/cpython/rev/849e113ddf83
changeset:   74651:849e113ddf83
parent:      74649:d1390175fdc6
parent:      74650:f8f9724e427c
user:        Antoine Pitrou <solipsis at pitrou.net>
date:        Fri Jan 27 10:03:23 2012 +0100
summary:
  Clarify that ssl.OP_ALL can be different from OpenSSL's SSL_OP_ALL.

files:
  Doc/library/ssl.rst |  3 ++-
  1 files changed, 2 insertions(+), 1 deletions(-)


diff --git a/Doc/library/ssl.rst b/Doc/library/ssl.rst
--- a/Doc/library/ssl.rst
+++ b/Doc/library/ssl.rst
@@ -392,7 +392,8 @@
 .. data:: OP_ALL
 
    Enables workarounds for various bugs present in other SSL implementations.
-   This option is set by default.
+   This option is set by default.  It does not necessarily set the same
+   flags as OpenSSL's ``SSL_OP_ALL`` constant.
 
    .. versionadded:: 3.2
 

-- 
Repository URL: http://hg.python.org/cpython