Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update socks documentation #325

Merged
merged 1 commit into from
Apr 19, 2018
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion lib/httpoison/base.ex
Original file line number Diff line number Diff line change
@@ -144,8 +144,10 @@ defmodule HTTPoison.Base do
* `:stream_to` - a PID to stream the response to
* `:async` - if given `:once`, will only stream one message at a time, requires call to `stream_next`
* `:proxy` - a proxy to be used for the request; it can be a regular url
or a `{Host, Port}` tuple
or a `{Host, Port}` tuple, or a `{:socks5, ProxyHost, ProxyPort} tuple
* `:proxy_auth` - proxy authentication `{User, Password}` tuple
* `:socks5_user`- socks5 username
* `:socks5_pass`- socks5 password
* `:ssl` - SSL options supported by the `ssl` erlang module
* `:follow_redirect` - a boolean that causes redirects to be followed
* `:max_redirect` - an integer denoting the maximum number of redirects to follow
2 changes: 1 addition & 1 deletion mix.exs
Original file line number Diff line number Diff line change
@@ -7,7 +7,7 @@ defmodule HTTPoison.Mixfile do

def project do
[ app: :httpoison,
version: "1.1.0",
version: "1.1.1",
elixir: "~> 1.2",
name: "HTTPoison",
description: @description,