[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] externals/websocket 2aad0b2 03/16: Upgrade to version 1.3.
From: |
Stefan Monnier |
Subject: |
[elpa] externals/websocket 2aad0b2 03/16: Upgrade to version 1.3. |
Date: |
Fri, 27 Nov 2020 17:47:18 -0500 (EST) |
branch: externals/websocket
commit 2aad0b20d5784f01ff47d9266bc6ceec1d805ed0
Author: Andrew Hyatt <ahyatt@gmail.com>
Commit: Stefan Monnier <monnier@iro.umontreal.ca>
Upgrade to version 1.3.
* websocket.el: (websocket-version):Update to 1.3
(websocket-close): Remove unnecessary call to process-buffer.
(websocket-close): Remove use of buffers in connections.
(websocket-open): Remove use of buffers in connections.
(websocket-open): Throw clear error when connection cannot be made.
(websocket-create-headers): Remove unnecessary Origin header.
---
websocket.el | 26 ++++++++++----------------
1 file changed, 10 insertions(+), 16 deletions(-)
diff --git a/websocket.el b/websocket.el
index 2390615..969e70b 100644
--- a/websocket.el
+++ b/websocket.el
@@ -5,7 +5,7 @@
;; Author: Andrew Hyatt <ahyatt at gmail dot com>
;; Maintainer: Andrew Hyatt <ahyatt at gmail dot com>
;; Keywords: Communication, Websocket, Server
-;; Version: 1.1
+;; Version: 1.3
;;
;; This program is free software; you can redistribute it and/or
;; modify it under the terms of the GNU General Public License as
@@ -99,7 +99,7 @@ same for the protocols.
accept-string
(inflight-input nil))
-(defvar websocket-version "1.2"
+(defvar websocket-version "1.3"
"Version numbers of this version of websocket.el.")
(defvar websocket-debug nil
@@ -556,9 +556,7 @@ connecting or open."
(make-websocket-frame :opcode 'close
:completep t))
(setf (websocket-ready-state websocket) 'closed))
- (let ((buf (process-buffer (websocket-conn websocket))))
- (delete-process (websocket-conn websocket))
- (kill-buffer buf)))
+ (delete-process (websocket-conn websocket)))
(defun websocket-ensure-connected (websocket)
"If the WEBSOCKET connection is closed, open it."
@@ -650,7 +648,6 @@ describing the problem with the frame.
(let* ((name (format "websocket to %s" url))
(url-struct (url-generic-parse-url url))
(key (websocket-genkey))
- (buf-name (format " *%s*" name))
(coding-system-for-read 'binary)
(coding-system-for-write 'binary)
(conn (if (member (url-type url-struct) '("ws" "wss"))
@@ -659,13 +656,12 @@ describing the problem with the frame.
(port (if (= 0 (url-port url-struct))
(if (eq type 'tls) 443 80)
(url-port url-struct)))
- (host (url-host url-struct))
- (buf (get-buffer-create buf-name)))
+ (host (url-host url-struct)))
(if (eq type 'plain)
- (make-network-process :name name :buffer buf :host
host
+ (make-network-process :name name :buffer nil :host
host
:service port :nowait nil)
(condition-case-unless-debug nil
- (open-network-stream name buf host port :type
type :nowait nil)
+ (open-network-stream name nil host port :type
type :nowait nil)
(wrong-number-of-arguments
(signal 'websocket-wss-needs-emacs-24 "wss")))))
(signal 'websocket-unsupported-protocol (url-type
url-struct))))
@@ -680,6 +676,7 @@ describing the problem with the frame.
:extensions (mapcar 'car extensions)
:accept-string
(websocket-calculate-accept key))))
+ (unless conn (error "Could not establish the websocket connection to %s"
url))
(process-put conn :websocket websocket)
(set-process-filter conn
(lambda (process output)
@@ -797,9 +794,10 @@ in the websocket client function `websocket-open'.
Returns the
connection, which should be kept in order to pass to
`websocket-server-close'."
(let* ((conn (make-network-process
- :name (format "websocket server on port %d" port)
+ :name (format "websocket server on port %s" port)
:server t
:family 'ipv4
+ :filter 'websocket-server-filter
:log 'websocket-server-accept
:filter-multibyte nil
:plist plist
@@ -840,10 +838,8 @@ connection, which should be kept in order to pass to
:extensions (mapcar 'car (process-get server :extensions)))))
(unless (member ws websocket-server-websockets)
(push ws websocket-server-websockets))
- (set-process-coding-system client 'unix 'unix)
(process-put client :websocket ws)
- (set-process-filter client 'websocket-server-filter)
- (set-process-coding-system client 'binary)
+ (set-process-coding-system client 'binary 'binary)
(set-process-sentinel client
(lambda (process change)
(let ((websocket (process-get process :websocket)))
@@ -860,7 +856,6 @@ These are defined as in `websocket-open'."
"Upgrade: websocket\r\n"
"Connection: Upgrade\r\n"
"Sec-WebSocket-Key: %s\r\n"
- "Origin: %s\r\n"
"Sec-WebSocket-Version: 13\r\n"
(when protocol
(concat
@@ -880,7 +875,6 @@ These are defined as in `websocket-open'."
"\r\n")
(url-host (url-generic-parse-url url))
key
- system-name
protocol))
(defun websocket-get-server-response (websocket client-protocols
client-extensions)
- [elpa] branch externals/websocket created (now f11d03a), Stefan Monnier, 2020/11/27
- [elpa] externals/websocket 350ea63 01/16: 2013-09-15 Andrew Hyatt <address@hidden>, Stefan Monnier, 2020/11/27
- [elpa] externals/websocket cd7a044 04/16: Version 1.4, fix for ping/pong & 32-bit emacs., Stefan Monnier, 2020/11/27
- [elpa] externals/websocket a5a25d4 08/16: * websocket/websocket.el (websocket-server-accept): Mark arg as unused, Stefan Monnier, 2020/11/27
- [elpa] externals/websocket 45d421d 09/16: Fix some quoting problems in doc strings, Stefan Monnier, 2020/11/27
- [elpa] externals/websocket e008e03 02/16: websocket.el: Set version to 1.2, after last set of server fixes., Stefan Monnier, 2020/11/27
- [elpa] externals/websocket 2aad0b2 03/16: Upgrade to version 1.3.,
Stefan Monnier <=
- [elpa] externals/websocket 50d62ac 05/16: Add ability to handle cookies., Stefan Monnier, 2020/11/27
- [elpa] externals/websocket 6872e74 06/16: Fix maintainer address, Stefan Monnier, 2020/11/27
- [elpa] externals/websocket 6fa9830 07/16: Version 1.6, mostly fixes for fragmented headers., Stefan Monnier, 2020/11/27
- [elpa] externals/websocket 3b21915 10/16: Update to emacs-websocket version 1.8., Stefan Monnier, 2020/11/27
- [elpa] externals/websocket ba4334b 11/16: Remove use of string-make-unibyte and other cleanups., Stefan Monnier, 2020/11/27
- [elpa] externals/websocket 65b3e1c 12/16: Port websocket to bleeding-edge 32-bit Emacs, Stefan Monnier, 2020/11/27
- [elpa] externals/websocket bc57ded 15/16: Upgrade websocket library to version 1.11.1., Stefan Monnier, 2020/11/27
- [elpa] externals/websocket 8d540d4 13/16: websocket: Version 1.9, custom header support., Stefan Monnier, 2020/11/27
- [elpa] externals/websocket c4d8d58 14/16: Fix confusing documentation string in websocket library., Stefan Monnier, 2020/11/27
- [elpa] externals/websocket f11d03a 16/16: Allow websocket accept header variants., Stefan Monnier, 2020/11/27