projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'issue/2036-part-2' into 'develop'
[akkoma]
/
lib
/
pleroma
/
plugs
/
remote_ip.ex
diff --git
a/lib/pleroma/plugs/remote_ip.ex
b/lib/pleroma/plugs/remote_ip.ex
index fdedc27eed6dcf8b2bf7aa7cb5d2bc4235a7bff4..2eca4f8f669789491870a8d473e79edfabb10a1f 100644
(file)
--- a/
lib/pleroma/plugs/remote_ip.ex
+++ b/
lib/pleroma/plugs/remote_ip.ex
@@
-1,5
+1,5
@@
# Pleroma: A lightweight social networking server
# Pleroma: A lightweight social networking server
-# Copyright © 2017-20
19
Pleroma Authors <https://pleroma.social/>
+# Copyright © 2017-20
20
Pleroma Authors <https://pleroma.social/>
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Plugs.RemoteIp do
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Plugs.RemoteIp do
@@
-10,10
+10,7
@@
defmodule Pleroma.Plugs.RemoteIp do
@behaviour Plug
@headers ~w[
@behaviour Plug
@headers ~w[
- forwarded
x-forwarded-for
x-forwarded-for
- x-client-ip
- x-real-ip
]
# https://en.wikipedia.org/wiki/Localhost
]
# https://en.wikipedia.org/wiki/Localhost