diff options
author | daurnimator <quae@daurnimator.com> | 2014-09-29 13:59:16 -0400 |
---|---|---|
committer | daurnimator <quae@daurnimator.com> | 2014-09-29 13:59:16 -0400 |
commit | f5f64c67636ac8bfc9e1add666229278c689bf0a (patch) | |
tree | 8df3d5f560f6323de29139b602f253e16dddcbeb /net/websocket.lua | |
parent | 114ee0900825470efd2a053197e56bb6a4697167 (diff) | |
parent | 89a01cc8d9df143ec83a6bafbc4864fb7f3353df (diff) | |
download | prosody-f5f64c67636ac8bfc9e1add666229278c689bf0a.tar.gz prosody-f5f64c67636ac8bfc9e1add666229278c689bf0a.zip |
Merge 0.10->trunk
Diffstat (limited to 'net/websocket.lua')
-rw-r--r-- | net/websocket.lua | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/websocket.lua b/net/websocket.lua index f8daa278..a4274eec 100644 --- a/net/websocket.lua +++ b/net/websocket.lua @@ -134,7 +134,7 @@ function websocket_methods:close(code, reason) log("debug", "closing WebSocket with code %i: %s" , code , tostring(reason)); self.readyState = 2; local handler = self.handler; - handler:write(frames.build_close(code, reason)); + handler:write(frames.build_close(code, reason, true)); -- Do not close socket straight away, wait for acknowledgement from server. self.close_timer = timer.add_task(close_timeout, close_timeout_cb, self); elseif self.readyState == 2 then |