[3.6] Update docs to clarify proxy support (#4101) (#4110)

Clarify that, while aiohttp supports proxies that upgrade to HTTPS via CONNECT, it doesn't support proxies that must be connected to via `https://` - #4100 . Co-Authored-By: Andrew Svetlov <[email protected]> (cherry picked from commit be95c61) Co-authored-by: Benjamin Kane <[email protected]>
aio-libs · Sep 27, 2019 · 8f039dc · 8f039dc
1 parent 83c839f
commit 8f039dc
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/CHANGES/4100.doc b/CHANGES/4100.doc
@@ -0,0 +1 @@
+Update docs to reflect proxy support.
diff --git a/docs/client_advanced.rst b/docs/client_advanced.rst
@@ -500,8 +500,9 @@ DER with e.g::
 Proxy support
 -------------
 
-aiohttp supports HTTP/HTTPS proxies. You have to use
-*proxy* parameter::
+aiohttp supports plain HTTP proxies and HTTP proxies that can be upgraded to HTTPS
+via the HTTP CONNECT method. aiohttp does not support proxies that must be
+connected to via ``https://``. To connect, use the *proxy* parameter::
 
    async with aiohttp.ClientSession() as session:
        async with session.get("http://python.org",