diff options
| author | F. Jason Park | 2020-12-11 16:36:02 +0100 |
|---|---|---|
| committer | Lars Ingebrigtsen | 2020-12-11 16:36:02 +0100 |
| commit | abc8d6b9465fecb989170426756c7ee4b133fd40 (patch) | |
| tree | 903d7cf63b573cde9ae6ac6677ea2d3829e6b110 | |
| parent | fec05bc6679361909dfd1dbe1abdc944591ec840 (diff) | |
| download | emacs-abc8d6b9465fecb989170426756c7ee4b133fd40.tar.gz emacs-abc8d6b9465fecb989170426756c7ee4b133fd40.zip | |
Append incremental message segments in socks-filter
* lisp/net/socks.el (socks-filter): Preserve the order data arrive
instead of semi-reversing it (bug#45162).
Copyright-paperwork-exempt: yes
| -rw-r--r-- | lisp/net/socks.el | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lisp/net/socks.el b/lisp/net/socks.el index 9b22a5083fb..cb50a0adbea 100644 --- a/lisp/net/socks.el +++ b/lisp/net/socks.el | |||
| @@ -260,7 +260,7 @@ | |||
| 260 | (setq state (process-get proc 'socks-state)) | 260 | (setq state (process-get proc 'socks-state)) |
| 261 | (cond | 261 | (cond |
| 262 | ((= state socks-state-waiting-for-auth) | 262 | ((= state socks-state-waiting-for-auth) |
| 263 | (cl-callf (lambda (s) (setq string (concat string s))) | 263 | (cl-callf (lambda (s) (setq string (concat s string))) |
| 264 | (process-get proc 'socks-scratch)) | 264 | (process-get proc 'socks-scratch)) |
| 265 | (if (< (length string) 2) | 265 | (if (< (length string) 2) |
| 266 | nil ; We need to spin some more | 266 | nil ; We need to spin some more |
| @@ -272,7 +272,7 @@ | |||
| 272 | ((= state socks-state-authenticated) | 272 | ((= state socks-state-authenticated) |
| 273 | ) | 273 | ) |
| 274 | ((= state socks-state-waiting) | 274 | ((= state socks-state-waiting) |
| 275 | (cl-callf (lambda (s) (setq string (concat string s))) | 275 | (cl-callf (lambda (s) (setq string (concat s string))) |
| 276 | (process-get proc 'socks-scratch)) | 276 | (process-get proc 'socks-scratch)) |
| 277 | (setq version (process-get proc 'socks-server-protocol)) | 277 | (setq version (process-get proc 'socks-server-protocol)) |
| 278 | (cond | 278 | (cond |
| @@ -542,7 +542,7 @@ | |||
| 542 | service)) | 542 | service)) |
| 543 | (process-put proc 'socks-buffer buffer) | 543 | (process-put proc 'socks-buffer buffer) |
| 544 | (process-put proc 'socks-host host) | 544 | (process-put proc 'socks-host host) |
| 545 | (process-put proc 'socks-service host) | 545 | (process-put proc 'socks-service service) |
| 546 | (set-process-filter proc nil) | 546 | (set-process-filter proc nil) |
| 547 | (set-process-buffer proc (if buffer (get-buffer-create buffer))) | 547 | (set-process-buffer proc (if buffer (get-buffer-create buffer))) |
| 548 | proc)))) | 548 | proc)))) |