Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Pleroma
pleroma
Commits
9b396706
Commit
9b396706
authored
Oct 26, 2018
by
kaniini
Browse files
Merge branch 'bugfix/http-fd-exhaustion-mediaproxy' into 'develop'
http: fix mediaproxy FD leaks See merge request
pleroma/pleroma!395
parents
ae7c79cf
c302c619
Pipeline
#4132
passed with stages
in 5 minutes and 53 seconds
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
lib/pleroma/http/http.ex
View file @
9b396706
...
...
@@ -19,7 +19,7 @@ defp process_sni_options(options, url) do
end
end
def
p
process_request_options
(
options
)
do
def
process_request_options
(
options
)
do
config
=
Application
.
get_env
(
:pleroma
,
:http
,
[])
proxy
=
Keyword
.
get
(
config
,
:proxy_url
,
nil
)
options
=
options
++
[
hackney:
[
pool:
:default
]]
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment