* server.el (server-start): Force IPv4 and use literal 127.0.0.1.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 1d7cfe90f9b1df4f96497eb01ce51d79ceeff044..f0650ea89e2a8736c9361ca01099b0ef3c297aad 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2010-08-03  Juanma Barranquero  <lekktu@gmail.com>
+
+       * 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  <monnier@iro.umontreal.ca>
 
        * bindings.el (complete-symbol): Run completion-at-point as a fallback.

diff --git a/lisp/server.el b/lisp/server.el
index d36b99cc5b6c4546e916e517acb9520ab9ad376b..e8a0125f554a8af07c7ee90a3237233061a4440e 100644 (file)
--- 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