diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 70606c7f..270c76d0 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -17,6 +17,8 @@ This project adheres to `Semantic Versioning `_. * Added ``--default-scheme ``. * Added fish shell completion (located in ``extras/httpie-completion.fish`` in the Github repo). +* Updated ``requests`` to 2.10.0 so that SOCKS support can be added via + ``pip install requests[socks]``. * Changed the default JSON ``Accept`` header from ``application/json`` to ``application/json, */*``. diff --git a/README.rst b/README.rst index 6e8cb6d1..347df35b 100644 --- a/README.rst +++ b/README.rst @@ -713,6 +713,23 @@ In your ``~/.bash_profile``: export NO_PROXY=localhost,example.com +SOCKS +----- + +To enable SOCKS proxy support please install ``requests[socks]`` using ``pip``: + + +.. code-block::bash + + $ pip install -U requests[socks] + +Usage is the same as for other types of `proxies`_: + +.. code-block::bash + + $ http --proxy=http:socks5://user:pass@host:port --proxy=https:socks5://user:pass@host:port example.org + + ===== HTTPS ===== diff --git a/setup.py b/setup.py index d1d6e793..f4b56a33 100644 --- a/setup.py +++ b/setup.py @@ -35,7 +35,7 @@ tests_require = [ install_requires = [ - 'requests>=2.3.0', + 'requests>=2.10.0', 'Pygments>=1.5' ]