diff options
| author | Andrea Corallo <akrl@sdf.org> | 2021-02-21 22:08:01 +0100 |
|---|---|---|
| committer | Andrea Corallo <akrl@sdf.org> | 2021-02-21 22:08:01 +0100 |
| commit | cf1e8e792f60949e09e3ad4c53fb61b0b7628229 (patch) | |
| tree | 35080229c9e3b46e5db14a2f051c001ab8c6e586 /lisp/net/socks.el | |
| parent | 39792cf62987ecc1a772f6a2027d6b32c70e8312 (diff) | |
| parent | d0c47652e527397cae96444c881bf60455c763c1 (diff) | |
| download | emacs-cf1e8e792f60949e09e3ad4c53fb61b0b7628229.tar.gz emacs-cf1e8e792f60949e09e3ad4c53fb61b0b7628229.tar.bz2 emacs-cf1e8e792f60949e09e3ad4c53fb61b0b7628229.zip | |
Merge remote-tracking branch 'savannah/master' into HEAD
Diffstat (limited to 'lisp/net/socks.el')
| -rw-r--r-- | lisp/net/socks.el | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lisp/net/socks.el b/lisp/net/socks.el index 96fafc826b8..1da1d31d678 100644 --- a/lisp/net/socks.el +++ b/lisp/net/socks.el @@ -390,6 +390,8 @@ proc))) (defun socks-send-command (proc command atype address port) + "Send COMMAND to SOCKS service PROC for proxying ADDRESS and PORT. +When ATYPE indicates an IP, param ADDRESS must be given as raw bytes." (let ((addr (cond ((or (= atype socks-address-type-v4) (= atype socks-address-type-v6)) @@ -528,7 +530,7 @@ (setq host (socks-nslookup-host host)) (if (not (listp host)) (error "Could not get IP address for: %s" host)) - (setq host (apply #'format "%c%c%c%c" host)) + (setq host (apply #'unibyte-string host)) socks-address-type-v4) (t socks-address-type-name)))) |