3pp-mirror/penpot
1
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2025-05-11 04:16:40 +02:00
Code Issues Projects Releases Packages 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
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