[Python-checkins] cpython (merge 3.3 -> 3.4): merge 3.3

[benjamin.peterson]

https://hg.python.org/cpython/rev/64684ebadec0
changeset:   93033:64684ebadec0
branch:      3.4
parent:      93019:d686de84dc10
parent:      93032:433d10b195f2
user:        Benjamin Peterson <benjamin at python.org>
date:        Mon Oct 13 11:55:02 2014 -0400
summary:
  merge 3.3

files:
  Doc/library/xmlrpc.client.rst |  5 +++++
  1 files changed, 5 insertions(+), 0 deletions(-)


diff --git a/Doc/library/xmlrpc.client.rst b/Doc/library/xmlrpc.client.rst
--- a/Doc/library/xmlrpc.client.rst
+++ b/Doc/library/xmlrpc.client.rst
@@ -27,6 +27,11 @@
    constructed data.  If you need to parse untrusted or unauthenticated data see
    :ref:`xml-vulnerabilities`.
 
+.. warning::
+
+   In the case of https URIS, :mod:`xmlrpc.client` does not do any verification
+   of the server's certificate.
+
 
 .. class:: ServerProxy(uri, transport=None, encoding=None, verbose=False, \
                        allow_none=False, use_datetime=False, \

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