Merge pull request #96 from guzba/ryan

0.3.5

mummy.nimble

@@ -1,4 +1,4 @@
-version     = "0.3.4"
+version     = "0.3.5"
 author      = "Ryan Oldenburg"
 description = "Multithreaded HTTP + WebSocket server"
 license     = "MIT"

src/mummy/internal.nim

@@ -1,4 +1,4 @@
-import common, std/nativesockets, webby/httpheaders
+import common, std/nativesockets, webby/httpheaders, std/endians
 
 template currentExceptionAsMummyError*(): untyped =
   let e = getCurrentException()
@@ -31,9 +31,10 @@ proc encodeFrameHeader*(
     copyMem(result[result.len - 2].addr, l.addr, 2)
   else:
     result.add 127.char
-    var l = cast[uint32](payloadLen).htonl
+    var l: uint64
+    bigEndian64(l.addr, payloadLen.unsafeAddr)
     result.setLen(result.len + 8)
-    copyMem(result[result.len - 4].addr, l.addr, 4)
+    copyMem(result[result.len - 8].addr, l.addr, 8)
 
 proc encodeHeaders*(
   statusCode: int,

tests/test_websockets.nim

@@ -39,7 +39,10 @@ proc websocketHandler(
       doAssert message.data == ""
     of mummy.Pong:
       doAssert false
-    websocket.send("Fifth", mummy.BinaryMessage)
+    var fifth: string
+    for i in 0 ..< 0xffff + 1:
+      fifth.add 'a'
+    websocket.send(fifth, mummy.BinaryMessage)
   of ErrorEvent:
     discard
   of CloseEvent:
@@ -61,8 +64,9 @@ proc requesterProc() =
   ws.send("Third")
   ws.send("Fourth", whisky.BinaryMessage)
   ws.send("", whisky.Ping)
-  doAssert ws.receiveMessage() ==
-    some(whisky.Message(kind: whisky.BinaryMessage, data: "Fifth"))
+  let fifth = ws.receiveMessage()
+  doAssert fifth.get.kind == whisky.BinaryMessage
+  doAssert fifth.get.data.len == 0xffff + 1
   ws.close()
 
   echo "Done, shut down the server"