From: Juanma Barranquero Date: Tue, 3 Aug 2010 13:04:20 +0000 (+0200) Subject: * server.el (server-start): Force IPv4 and use literal 127.0.0.1. X-Git-Tag: emacs-pretest-23.2.90~139^2~35^2~1 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=d5b8058fb09545686338769edf92a4f73c166520;p=emacs.git * server.el (server-start): Force IPv4 and use literal 127.0.0.1. --- diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 1d7cfe90f9b..f0650ea89e2 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2010-08-03 Juanma Barranquero + + * server.el (server-start): When using TCP sockets, force IPv4 + and use a literal 127.0.0.1 for localhost. (Related to bug#6781.) + 2010-08-02 Stefan Monnier * bindings.el (complete-symbol): Run completion-at-point as a fallback. diff --git a/lisp/server.el b/lisp/server.el index d36b99cc5b6..e8a0125f554 100644 --- a/lisp/server.el +++ b/lisp/server.el @@ -560,9 +560,9 @@ server or call `M-x server-force-delete' to forcibly disconnect it.") :coding 'raw-text-unix ;; The other args depend on the kind of socket used. (if server-use-tcp - (list :family nil + (list :family 'ipv4 ;; We're not ready for IPv6 yet :service t - :host (or server-host 'local) + :host (or server-host "127.0.0.1") ;; See bug#6781 :plist '(:authenticated nil)) (list :family 'local :service server-file