diff options
| author | lambda <pleromagit@rogerbraun.net> | 2018-11-13 15:15:05 +0000 |
|---|---|---|
| committer | lambda <pleromagit@rogerbraun.net> | 2018-11-13 15:15:05 +0000 |
| commit | a43195bdaa295f624315cba9daad42097de0cfe7 (patch) | |
| tree | c22a5d599bb619ce640ac5b790d46eac2d95982d /lib/pleroma/web/router.ex | |
| parent | 22d20c497b813cdaedddb40a46df2f597311b235 (diff) | |
| parent | 9b553a1087a3539280a4a085bcf7a79f29972f0a (diff) | |
| download | pleroma-a43195bdaa295f624315cba9daad42097de0cfe7.tar.gz | |
Merge branch 'media-proxy-safety' into 'develop'
media_proxy: CSP, content-disposition
See merge request pleroma/pleroma!448
Diffstat (limited to 'lib/pleroma/web/router.ex')
| -rw-r--r-- | lib/pleroma/web/router.ex | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/pleroma/web/router.ex b/lib/pleroma/web/router.ex index 06d0f0623..2d4302dcd 100644 --- a/lib/pleroma/web/router.ex +++ b/lib/pleroma/web/router.ex @@ -378,12 +378,12 @@ defmodule Pleroma.Web.Router do end pipeline :remote_media do - plug(:accepts, ["html"]) end scope "/proxy/", Pleroma.Web.MediaProxy do pipe_through(:remote_media) get("/:sig/:url", MediaProxyController, :remote) + get("/:sig/:url/:filename", MediaProxyController, :remote) end scope "/", Fallback do |