merge 3.4
diff --git a/Doc/library/http.server.rst b/Doc/library/http.server.rst
index dd19fb4..0d8e7fe 100644
--- a/Doc/library/http.server.rst
+++ b/Doc/library/http.server.rst
@@ -81,7 +81,10 @@
Holds an instance of the class specified by the :attr:`MessageClass` class
variable. This instance parses and manages the headers in the HTTP
- request.
+ request. The :func:`~http.client.parse_headers` function from
+ :mod:`http.client` is used to parse the headers and it requires that the
+ HTTP request provide a valid :rfc:`2822` style header.
+
.. attribute:: rfile