mirror of
https://github.com/penpot/penpot.git
synced 2025-01-09 08:20:45 -05:00
Merge remote-tracking branch 'origin/staging'
This commit is contained in:
commit
c1a4ae9d36
3 changed files with 8 additions and 4 deletions
|
@ -64,6 +64,7 @@
|
||||||
(yrs/response :status 307
|
(yrs/response :status 307
|
||||||
:headers {"location" (str url)
|
:headers {"location" (str url)
|
||||||
"x-host" (cond-> host port (str ":" port))
|
"x-host" (cond-> host port (str ":" port))
|
||||||
|
"x-mtype" (:content-type mdata)
|
||||||
"cache-control" (str "max-age=" (inst-ms cache-max-age))}))
|
"cache-control" (str "max-age=" (inst-ms cache-max-age))}))
|
||||||
|
|
||||||
:fs
|
:fs
|
||||||
|
|
|
@ -101,7 +101,8 @@
|
||||||
(fn [_ error]
|
(fn [_ error]
|
||||||
(a/close! close-ch)
|
(a/close! close-ch)
|
||||||
(when-not (or (instance? java.nio.channels.ClosedChannelException error)
|
(when-not (or (instance? java.nio.channels.ClosedChannelException error)
|
||||||
(instance? java.net.SocketException error))
|
(instance? java.net.SocketException error)
|
||||||
|
(instance? java.io.IOException error))
|
||||||
(l/error :hint (ex-message error) :cause error)))
|
(l/error :hint (ex-message error) :cause error)))
|
||||||
|
|
||||||
on-ws-message
|
on-ws-message
|
||||||
|
|
|
@ -66,6 +66,7 @@ http {
|
||||||
set $redirect_uri "$upstream_http_location";
|
set $redirect_uri "$upstream_http_location";
|
||||||
set $redirect_host "$upstream_http_x_host";
|
set $redirect_host "$upstream_http_x_host";
|
||||||
set $redirect_cache_control "$upstream_http_cache_control";
|
set $redirect_cache_control "$upstream_http_cache_control";
|
||||||
|
set $real_mtype "$upstream_http_x_mtype";
|
||||||
|
|
||||||
proxy_set_header Host "$redirect_host";
|
proxy_set_header Host "$redirect_host";
|
||||||
proxy_hide_header etag;
|
proxy_hide_header etag;
|
||||||
|
@ -75,9 +76,10 @@ http {
|
||||||
proxy_hide_header x-amz-server-side-encryption;
|
proxy_hide_header x-amz-server-side-encryption;
|
||||||
proxy_pass $redirect_uri;
|
proxy_pass $redirect_uri;
|
||||||
|
|
||||||
#add_header x-internal-redirect "$redirect_uri";
|
add_header x-internal-redirect "$redirect_uri";
|
||||||
#add_header x-cache-control "$redirect_cache_control";
|
add_header x-cache-control "$redirect_cache_control";
|
||||||
#add_header cache-control "$redirect_cache_control";
|
add_header cache-control "$redirect_cache_control";
|
||||||
|
add_header content-type "$real_mtype";
|
||||||
}
|
}
|
||||||
|
|
||||||
location /assets {
|
location /assets {
|
||||||
|
|
Loading…
Reference in a new issue