X-Git-Url: https://jxself.org/git/?p=8sync.git;a=blobdiff_plain;f=8sync%2Fsystems%2Fwebsocket%2Fserver.scm;h=c29ce51e44c40c545219f258daad01dee5207631;hp=af0fe1fb5b88af205c7c53d825f6e65e91e42679;hb=HEAD;hpb=d41139ae20e9eff838fcf129196a09b0efe219d9 diff --git a/8sync/systems/websocket/server.scm b/8sync/systems/websocket/server.scm index af0fe1f..11704d4 100644 --- a/8sync/systems/websocket/server.scm +++ b/8sync/systems/websocket/server.scm @@ -1,7 +1,7 @@ ;;; guile-websocket --- WebSocket client/server ;;; Copyright © 2015 David Thompson ;;; Copyright © 2017 Christopher Allan Webber -;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen +;;; Copyright © 2020,2021 Jan (janneke) Nieuwenhuizen ;;; ;;; This file is part of guile-websocket. ;;; @@ -71,8 +71,7 @@ string." ((ws-send websocket-server-send)) (upgrade-paths #:init-value `(("websocket" . ,(wrap-apply websocket-client-loop))) - #:allocation #:each-subclass - #:accessor .upgrade-paths) + #:allocation #:each-subclass) (gen-client-id #:init-thunk make-simple-counter) @@ -157,11 +156,12 @@ called for each complete message that is received." (loop fragments type)) ((first-fragment-frame? frame) ; begin accumulating fragments (loop (list frame) (frame-type frame))) - ((fragment-frame? frame) ; add a fragment - (loop (cons frame fragments) type)) ((final-fragment-frame? frame) ; concatenate all fragments - (handle-data-frame type (frame-concatenate (reverse fragments))) + (handle-data-frame type (frame-concatenate + (reverse (cons frame fragments)))) (loop '() #f)) + ((fragment-frame? frame) ; add a fragment + (loop (cons frame fragments) type)) ((data-frame? frame) ; unfragmented data frame (handle-data-frame (frame-type frame) (frame-data frame)) (loop '() #f)))))))