From dfcdc97bcdbcd1b3d0a4cca3892d07bfeb0e64d3 Mon Sep 17 00:00:00 2001 From: Andreas Gerler Date: Sun, 22 Dec 2024 13:22:17 +0100 Subject: [PATCH] update websocket Signed-off-by: Andreas Gerler --- .../websocket-autoloads.el | 26 ----------------- elpa/websocket-20230305.410/websocket-pkg.el | 14 ---------- .../websocket-autoloads.el | 28 +++++++++++++++++++ elpa/websocket-20230809.305/websocket-pkg.el | 10 +++++++ .../websocket.el | 19 ++++++++----- 5 files changed, 50 insertions(+), 47 deletions(-) delete mode 100644 elpa/websocket-20230305.410/websocket-autoloads.el delete mode 100644 elpa/websocket-20230305.410/websocket-pkg.el create mode 100644 elpa/websocket-20230809.305/websocket-autoloads.el create mode 100644 elpa/websocket-20230809.305/websocket-pkg.el rename elpa/{websocket-20230305.410 => websocket-20230809.305}/websocket.el (98%) diff --git a/elpa/websocket-20230305.410/websocket-autoloads.el b/elpa/websocket-20230305.410/websocket-autoloads.el deleted file mode 100644 index 8e93729a..00000000 --- a/elpa/websocket-20230305.410/websocket-autoloads.el +++ /dev/null @@ -1,26 +0,0 @@ -;;; websocket-autoloads.el --- automatically extracted autoloads -*- lexical-binding: t -*- -;; -;;; Code: - -(add-to-list 'load-path (directory-file-name - (or (file-name-directory #$) (car load-path)))) - - -;;;### (autoloads nil "websocket" "websocket.el" (0 0 0 0)) -;;; Generated autoloads from websocket.el - -(register-definition-prefixes "websocket" '("websocket-")) - -;;;*** - -;;;### (autoloads nil nil ("websocket-pkg.el") (0 0 0 0)) - -;;;*** - -;; Local Variables: -;; version-control: never -;; no-byte-compile: t -;; no-update-autoloads: t -;; coding: utf-8 -;; End: -;;; websocket-autoloads.el ends here diff --git a/elpa/websocket-20230305.410/websocket-pkg.el b/elpa/websocket-20230305.410/websocket-pkg.el deleted file mode 100644 index 55e864c2..00000000 --- a/elpa/websocket-20230305.410/websocket-pkg.el +++ /dev/null @@ -1,14 +0,0 @@ -(define-package "websocket" "20230305.410" "Emacs WebSocket client and server" - '((cl-lib "0.5")) - :commit "1a08093b122d8cf20366a1cba5faddf7a53d08ed" :authors - '(("Andrew Hyatt" . "ahyatt@gmail.com")) - :maintainers - '(("Andrew Hyatt" . "ahyatt@gmail.com")) - :maintainer - '("Andrew Hyatt" . "ahyatt@gmail.com") - :keywords - '("communication" "websocket" "server") - :url "https://github.com/ahyatt/emacs-websocket") -;; Local Variables: -;; no-byte-compile: t -;; End: diff --git a/elpa/websocket-20230809.305/websocket-autoloads.el b/elpa/websocket-20230809.305/websocket-autoloads.el new file mode 100644 index 00000000..250cc490 --- /dev/null +++ b/elpa/websocket-20230809.305/websocket-autoloads.el @@ -0,0 +1,28 @@ +;;; websocket-autoloads.el --- automatically extracted autoloads (do not edit) -*- lexical-binding: t -*- +;; Generated by the `loaddefs-generate' function. + +;; This file is part of GNU Emacs. + +;;; Code: + +(add-to-list 'load-path (or (and load-file-name (directory-file-name (file-name-directory load-file-name))) (car load-path))) + + + +;;; Generated autoloads from websocket.el + +(register-definition-prefixes "websocket" '("websocket-")) + +;;; End of scraped data + +(provide 'websocket-autoloads) + +;; Local Variables: +;; version-control: never +;; no-byte-compile: t +;; no-update-autoloads: t +;; no-native-compile: t +;; coding: utf-8-emacs-unix +;; End: + +;;; websocket-autoloads.el ends here diff --git a/elpa/websocket-20230809.305/websocket-pkg.el b/elpa/websocket-20230809.305/websocket-pkg.el new file mode 100644 index 00000000..ebffb145 --- /dev/null +++ b/elpa/websocket-20230809.305/websocket-pkg.el @@ -0,0 +1,10 @@ +;; -*- no-byte-compile: t; lexical-binding: nil -*- +(define-package "websocket" "20230809.305" + "Emacs WebSocket client and server." + '((cl-lib "0.5")) + :url "https://github.com/ahyatt/emacs-websocket" + :commit "40c208eaab99999d7c1e4bea883648da24c03be3" + :revdesc "40c208eaab99" + :keywords '("communication" "websocket" "server") + :authors '(("Andrew Hyatt" . "ahyatt@gmail.com")) + :maintainers '(("Andrew Hyatt" . "ahyatt@gmail.com"))) diff --git a/elpa/websocket-20230305.410/websocket.el b/elpa/websocket-20230809.305/websocket.el similarity index 98% rename from elpa/websocket-20230305.410/websocket.el rename to elpa/websocket-20230809.305/websocket.el index 947b68b3..025a50e6 100644 --- a/elpa/websocket-20230305.410/websocket.el +++ b/elpa/websocket-20230809.305/websocket.el @@ -1,11 +1,12 @@ ;;; websocket.el --- Emacs WebSocket client and server -*- lexical-binding:t -*- -;; Copyright (c) 2013, 2016-2017 Free Software Foundation, Inc. +;; Copyright (c) 2013, 2016-2023 Free Software Foundation, Inc. ;; Author: Andrew Hyatt ;; Homepage: https://github.com/ahyatt/emacs-websocket ;; Keywords: Communication, Websocket, Server -;; Version: 1.14 +;; Package-Version: 20230809.305 +;; Package-Revision: 40c208eaab99 ;; Package-Requires: ((cl-lib "0.5")) ;; ;; This program is free software; you can redistribute it and/or @@ -98,6 +99,7 @@ same for the protocols." (conn (cl-assert nil) :read-only t) ;; Only populated for servers, this is the server connection. server-conn + origin accept-string (inflight-input nil)) @@ -199,9 +201,9 @@ approximately 537M long." (let* ((32-bit-parts (bindat-get-field (bindat-unpack '((:val vec 2 u32)) s) :val)) (cval - (logior (lsh (aref 32-bit-parts 0) 32) (aref 32-bit-parts 1)))) + (logior (ash (aref 32-bit-parts 0) 32) (aref 32-bit-parts 1)))) (if (and (= (aref 32-bit-parts 0) 0) - (= (lsh (aref 32-bit-parts 1) -29) 0)) + (= (ash (aref 32-bit-parts 1) -29) 0)) cval (signal 'websocket-unparseable-frame (list "Frame value found too large to parse!")))) @@ -236,10 +238,10 @@ approximately 537M long." val nbytes)) (if (= nbytes 8) (progn - (let* ((hi-32bits (lsh val -32)) + (let* ((hi-32bits (ash val -32)) ;; This is just VAL on systems that don't have >= 32 bits. - (low-32bits (- val (lsh hi-32bits 32)))) - (when (or (> hi-32bits 0) (> (lsh low-32bits -29) 0)) + (low-32bits (- val (ash hi-32bits 32)))) + (when (or (> hi-32bits 0) (> (ash low-32bits -29) 0)) (signal 'websocket-frame-too-large (list val))) (bindat-pack `((:val vec 2 u32)) `((:val . [,hi-32bits ,low-32bits]))))) @@ -997,6 +999,7 @@ All these parameters are defined as in `websocket-open'." ws (plist-get header-info :protocols) (plist-get header-info :extensions))) (setf (websocket-ready-state ws) 'open) + (setf (websocket-origin ws) (plist-get header-info :origin)) (websocket-try-callback 'websocket-on-open 'on-open ws)) (message "Invalid client headers found in: %s" output) @@ -1045,6 +1048,8 @@ messages and a plist containing `:key', the websocket key, (setq plist (plist-put plist :extensions (websocket-parse-repeated-field output "Sec-Websocket-Extensions")))) + (when (string-match "^Origin: \\(.+\\)\r\n" output) + (setq plist (plist-put plist :origin (match-string 1 output)))) plist))) (provide 'websocket) -- 2.47.3