johanels/penpot
1
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2025-12-12 06:24:17 +01:00
Code Issues Actions 9 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/staging' into develop

Browse Source
This commit is contained in:
Alejandro Alonso
2022-09-27 09:50:37 +02:00
parent 577db35777 1a9fbee412
commit e888b06ec4
3 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
backend/src/app/http/assets.clj
View File

@@ -64,6 +64,7 @@
(yrs/response :status 307
:headers {"location" (str url)
"x-host" (cond-> host port (str ":" port))
"x-mtype" (:content-type mdata)
"cache-control" (str "max-age=" (inst-ms cache-max-age))}))
:fs

3
backend/src/app/util/websocket.clj
View File

@@ -101,7 +101,8 @@
(fn [_ error]
(a/close! close-ch)
(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)))
on-ws-message

8
docker/devenv/files/nginx.conf
View File

@@ -66,6 +66,7 @@ http {
set $redirect_uri "$upstream_http_location";
set $redirect_host "$upstream_http_x_host";
set $redirect_cache_control "$upstream_http_cache_control";
set $real_mtype "$upstream_http_x_mtype";
proxy_set_header Host "$redirect_host";
proxy_hide_header etag;
@@ -75,9 +76,10 @@ http {
proxy_hide_header x-amz-server-side-encryption;
proxy_pass $redirect_uri;
#add_header x-internal-redirect "$redirect_uri";
#add_header x-cache-control "$redirect_cache_control";
#add_header cache-control "$redirect_cache_control";
add_header x-internal-redirect "$redirect_uri";
add_header x-cache-control "$redirect_cache_control";
add_header cache-control "$redirect_cache_control";
add_header content-type "$real_mtype";
}
location /assets {