Skip to content

Commit d936b1e

Browse files
committed
Update README.md
1 parent b508d54 commit d936b1e

File tree

1 file changed

+4
-24
lines changed

1 file changed

+4
-24
lines changed

README.md

Lines changed: 4 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -18,33 +18,13 @@ def deps do
1818
end
1919
```
2020

21-
and run `$ mix deps.get`. Add `:httpoison` to your applications list if your Elixir version is 1.3 or lower:
22-
23-
```elixir
24-
def application do
25-
[applications: [:httpoison]]
26-
end
27-
```
28-
21+
and run `$ mix deps.get`.
2922

3023
## Upgrading to 2.x.x
3124

32-
The main change that caused a major version is that `ssl` option now _merges_ with the default options where previously it would override the ssl options. The new option `ssl_override` was added to allow people to keep the previous behaviour but it's more explicit now.
25+
The main change that caused a major version is that `ssl` option now _merges_ with the default options where previously it would override the ssl options. The new option `ssl_override` was added to allow people to keep the previous behaviour but it's more explicit now.
3326

34-
```elixir
35-
defp default_ssl_options() do
36-
[
37-
{:versions, [:"tlsv1.2", :"tlsv1.3"]},
38-
{:verify, :verify_peer},
39-
{:cacertfile, :certifi.cacertfile()},
40-
{:depth, 10},
41-
{:customize_hostname_check,
42-
[
43-
match_fun: :public_key.pkix_verify_hostname_match_fun(:https)
44-
]}
45-
]
46-
end
47-
```
27+
The default SSL options can be found on [hackney's codebase](https://github.com/benoitc/hackney/blob/befe2df2080704824487c3c0201417d0ddb3c686/src/hackney_connection.erl#L115-L148) as we simply use `:hackney_connections.merge_ssl_opts/2`
4828

4929
More context here: https://github.com/edgurgel/httpoison/pull/466
5030

@@ -254,7 +234,7 @@ From the already linked [hackney's readme](https://github.com/benoitc/hackney#us
254234
255235
#### Disabling pool
256236

257-
If you don't want to use a pool for a single http request, you can do it by passing an option:
237+
If you don't want to use a pool for a single http request, you can do it by passing an option:
258238
```elixir
259239
HTTPoison.get("httpbin.org/get", [], hackney: [pool: false])
260240
```

0 commit comments

Comments
 (0)