[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] externals/websocket 73eb210eb0 081/114: Merge pull request #59 fr
From: |
ELPA Syncer |
Subject: |
[elpa] externals/websocket 73eb210eb0 081/114: Merge pull request #59 from dickmao/state-change |
Date: |
Wed, 15 Feb 2023 20:59:01 -0500 (EST) |
branch: externals/websocket
commit 73eb210eb03f504b81415cb57f176e881a37ae1c
Merge: 53bfd56e12 6369b4fc48
Author: Andrew Hyatt <ahyatt@gmail.com>
Commit: GitHub <noreply@github.com>
Merge pull request #59 from dickmao/state-change
encode-coding-string (quote utf-8) isn't necessary and was causing
disconnects somehow.
---
websocket.el | 15 ++++++---------
1 file changed, 6 insertions(+), 9 deletions(-)
diff --git a/websocket.el b/websocket.el
index 88c8c1b00b..b10bfb9dcd 100644
--- a/websocket.el
+++ b/websocket.el
@@ -46,6 +46,7 @@
(require 'bindat)
(require 'url-parse)
(require 'url-cookie)
+(require 'seq)
(eval-when-compile (require 'cl-lib))
;;; Code:
@@ -289,15 +290,11 @@ This is used to both mask and unmask data."
;; string of the same length (for example, 6 multibyte chars for 你好 instead
;; of the correct 6 unibyte chars, which would convert into 2 multibyte
;; chars).
- (funcall
- #'encode-coding-string
- (let ((result (make-string (length data) ?x)))
- (cl-loop
- for i from 0 below (length data)
- do
- (setf (seq-elt result i) (logxor (aref key (mod i 4)) (seq-elt data i)))
- finally (return result)))
- 'utf-8))
+ (cl-loop
+ with result = (make-string (length data) ?x)
+ for i from 0 below (length data)
+ do (setf (seq-elt result i) (logxor (aref key (mod i 4)) (seq-elt data i)))
+ finally return (string-as-unibyte result)))
(defun websocket-ensure-length (s n)
"Ensure the string S has at most N bytes.
- [elpa] externals/websocket 4ca406fb96 060/114: Merge branch 'custom-headers', (continued)
- [elpa] externals/websocket 4ca406fb96 060/114: Merge branch 'custom-headers', ELPA Syncer, 2023/02/15
- [elpa] externals/websocket b3a0153c0b 063/114: remove long line lambda, ELPA Syncer, 2023/02/15
- [elpa] externals/websocket e9d148fbb6 064/114: Merge pull request #52 from yuya373/fix-nowait, ELPA Syncer, 2023/02/15
- [elpa] externals/websocket 607355db44 067/114: rename to `websocket-ensure-handshake`, ELPA Syncer, 2023/02/15
- [elpa] externals/websocket 0d96ba2ff5 069/114: Merge fix for 32-bit emacs., ELPA Syncer, 2023/02/15
- [elpa] externals/websocket a5a3ddb5ca 072/114: Fix all signal calls., ELPA Syncer, 2023/02/15
- [elpa] externals/websocket ef1e504fec 075/114: Fix tests broken by recent changes., ELPA Syncer, 2023/02/15
- [elpa] externals/websocket da237af723 076/114: Fix confusing documentation string in `websocket-openp'., ELPA Syncer, 2023/02/15
- [elpa] externals/websocket 53bfd56e12 078/114: Upgrade version number to 1.11., ELPA Syncer, 2023/02/15
- [elpa] externals/websocket de8073d667 079/114: Is encode-coding-string (quote utf-8) necessary?, ELPA Syncer, 2023/02/15
- [elpa] externals/websocket 73eb210eb0 081/114: Merge pull request #59 from dickmao/state-change,
ELPA Syncer <=
- [elpa] externals/websocket fa751be5b7 083/114: Add new test for correct websocket frame encoding., ELPA Syncer, 2023/02/15
- [elpa] externals/websocket d91a9aef5a 084/114: Update version to 1.11.1., ELPA Syncer, 2023/02/15
- [elpa] externals/websocket 5be01c6d1a 085/114: Accept a common variation of the websocket header., ELPA Syncer, 2023/02/15
- [elpa] externals/websocket 491a60b8bb 086/114: Set version to 1.12., ELPA Syncer, 2023/02/15
- [elpa] externals/websocket 74e4b82bf1 087/114: Fix GPL 2/3 discrepancy by making the .el files match the license., ELPA Syncer, 2023/02/15
- [elpa] externals/websocket 69ee80a88b 088/114: Modernize & rewrite functional tests as ert tests., ELPA Syncer, 2023/02/15
- [elpa] externals/websocket 992ef33e46 089/114: Fix `process-status` returns `'connect` when nowait, ELPA Syncer, 2023/02/15
- [elpa] externals/websocket 74f00575b9 091/114: Make condition more readable, ELPA Syncer, 2023/02/15
- [elpa] externals/websocket 078f83902c 096/114: Merge pull request #68 from xhcoding/master, ELPA Syncer, 2023/02/15
- [elpa] externals/websocket 2c576b6cb8 113/114: Sets version to 1.14, ELPA Syncer, 2023/02/15