Skip to content

Commit

Permalink
rename to websocket-ensure-handshake
Browse files Browse the repository at this point in the history
  • Loading branch information
yuya373 committed Apr 22, 2018
1 parent 38c1f20 commit 607355d
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions websocket.el
Original file line number Diff line number Diff line change
Expand Up @@ -730,7 +730,7 @@ to the websocket protocol.
conn
(websocket-sentinel url conn key protocols extensions custom-header-alist nowait))
(set-process-query-on-exit-flag conn nil)
(websocket-handshake url conn key protocols extensions custom-header-alist)
(websocket-ensure-handshake url conn key protocols extensions custom-header-alist)
websocket))

(defun websocket-sentinel (url conn key protocols extensions custom-header-alist nowait)
Expand All @@ -739,13 +739,13 @@ to the websocket protocol.
(websocket-debug websocket "State change to %s" change)
(let ((status (process-status process)))
(when (and nowait (eq status 'open))
(websocket-handshake url conn key protocols extensions custom-header-alist))
(websocket-ensure-handshake url conn key protocols extensions custom-header-alist))

(when (and (member status '(closed failed exit signal))
(not (eq 'closed (websocket-ready-state websocket))))
(websocket-try-callback 'websocket-on-close 'on-close websocket))))))

(defun websocket-handshake (url conn key protocols extensions custom-header-alist)
(defun websocket-ensure-handshake (url conn key protocols extensions custom-header-alist)
(let ((url-struct (url-generic-parse-url url))
(websocket (process-get conn :websocket)))
(when (and (eq 'connecting (websocket-ready-state websocket))
Expand Down

0 comments on commit 607355d

Please sign in to comment.