summaryrefslogtreecommitdiff
path: root/lisp/server.el
diff options
context:
space:
mode:
authorJuanma Barranquero <lekktu@gmail.com>2010-08-03 15:04:20 +0200
committerJuanma Barranquero <lekktu@gmail.com>2010-08-03 15:04:20 +0200
commitd5b8058fb09545686338769edf92a4f73c166520 (patch)
tree54d997ea99a797dd0aa5d052ae8f6ae49ee3200c /lisp/server.el
parentc5958e82b755959e01a89f05b1b25bf223e7524a (diff)
downloademacs-d5b8058fb09545686338769edf92a4f73c166520.tar.gz
* server.el (server-start): Force IPv4 and use literal 127.0.0.1.
Diffstat (limited to 'lisp/server.el')
-rw-r--r--lisp/server.el4
1 files changed, 2 insertions, 2 deletions
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