Fix bug#6781: Use 127.0.0.1 for local hosts, not "localhost".

* lisp/server.el (server-start): Revert part of 2010-08-08 change.  Using
  address 127.0.0.1 for local host is now done in Fmake_network_process.
* src/process.c (Fmake_network_process): When arg :host is 'local,
  use address 127.0.0.1, not name "localhost".

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index df02432e79a503e520a13d920547c858a10fcf95..0af5f330232b7037a36a60726d89e64702fdad26 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2010-09-25  Juanma Barranquero  <lekktu@gmail.com>
+
+       * server.el (server-start): Revert part of 2010-08-08 change.  Using
+       address 127.0.0.1 for local host is now done in Fmake_network_process.
+
 2010-09-24  Glenn Morris  <rgm@gnu.org>
 
        * image-mode.el, progmodes/compile.el, progmodes/gud.el:

diff --git a/lisp/server.el b/lisp/server.el
index f0e88d03612fe963cc31d74c95719713e9a14a31..3a48efed7da2aafd3ff8a9ee98baaa7aca735912 100644 (file)
--- a/lisp/server.el
+++ b/lisp/server.el
@@ -565,7 +565,7 @@ server or call `M-x server-force-delete' to forcibly disconnect it.")
                       (if server-use-tcp
                           (list :family 'ipv4  ;; We're not ready for IPv6 yet
                                 :service t
-                                :host (or server-host "127.0.0.1") ;; See bug#6781
+                                :host (or server-host 'local)
                                 :plist '(:authenticated nil))
                         (list :family 'local
                               :service server-file

diff --git a/src/ChangeLog b/src/ChangeLog
index 94ae1496921b7774e34a1c1935aed2b6064e85a7..8b29c80494374c8fed8cc9ca5758bbe1b856b58d 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2010-09-25  Juanma Barranquero  <lekktu@gmail.com>
+
+       * process.c (Fmake_network_process): When arg :host is 'local,
+       use address 127.0.0.1, not name "localhost".  (Bug#6781)
+
 2010-09-24  Eli Zaretskii  <eliz@gnu.org>
 
        * indent.c (Fcurrent_indentation, indented_beyond_p)

diff --git a/src/process.c b/src/process.c
index ec1b9586db5bf74370566a3ea8bf092598db4704..ac82f12debb65dd40dd21ee0a6dd46581ce01d26 100644 (file)
--- a/src/process.c
+++ b/src/process.c
@@ -3170,7 +3170,9 @@ usage: (make-network-process &rest ARGS)  */)
   if (!NILP (host))
     {
       if (EQ (host, Qlocal))
-       host = build_string ("localhost");
+       /* Depending on setup, "localhost" may map to different IPv4 and/or
+          IPv6 addresses, so it's better to be explicit.  (Bug#6781) */
+       host = build_string ("127.0.0.1");
       CHECK_STRING (host);
     }