# HG changeset patch
# User Juanma Barranquero <lekktu@gmail.com>
# Date 1280840660 -7200
# Node ID d6a9e2c31587848738af973b424ba2aaa5e1fc3b
# Parent  b09078962d7c7d95b9bedfe69bc73fa1118ada23
* server.el (server-start): Force IPv4 and use literal 127.0.0.1.

diff -r b09078962d7c -r d6a9e2c31587 lisp/ChangeLog
--- a/lisp/ChangeLog	Mon Aug 02 21:35:28 2010 +0200
+++ b/lisp/ChangeLog	Tue Aug 03 15:04:20 2010 +0200
@@ -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 -r b09078962d7c -r d6a9e2c31587 lisp/server.el
--- a/lisp/server.el	Mon Aug 02 21:35:28 2010 +0200
+++ b/lisp/server.el	Tue Aug 03 15:04:20 2010 +0200
@@ -560,9 +560,9 @@
 		       :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