[Emacs-diffs] /srv/bzr/emacs/trunk r101599: Fix bug#6781: Use 127.0.0.1 for local hosts, not "localhost".

[Juanma Barranquero]

------------------------------------------------------------
revno: 101599
committer: Juanma Barranquero <address@hidden>
branch nick: trunk
timestamp: Sat 2010-09-25 02:32:09 +0200
message:
  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".
modified:
  lisp/ChangeLog
  lisp/server.el
  src/ChangeLog
  src/process.c

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2010-09-24 03:23:07 +0000
+++ b/lisp/ChangeLog    2010-09-25 00:32:09 +0000
@@ -1,3 +1,8 @@
+2010-09-25  Juanma Barranquero  <address@hidden>
+
+       * 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  <address@hidden>
 
        * image-mode.el, progmodes/compile.el, progmodes/gud.el:

=== modified file 'lisp/server.el'
--- a/lisp/server.el    2010-08-26 13:46:19 +0000
+++ b/lisp/server.el    2010-09-25 00:32:09 +0000
@@ -565,7 +565,7 @@
                       (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

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2010-09-24 19:30:13 +0000
+++ b/src/ChangeLog     2010-09-25 00:32:09 +0000
@@ -1,3 +1,8 @@
+2010-09-25  Juanma Barranquero  <address@hidden>
+
+       * 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  <address@hidden>
 
        * indent.c (Fcurrent_indentation, indented_beyond_p)

=== modified file 'src/process.c'
--- a/src/process.c     2010-09-17 15:47:49 +0000
+++ b/src/process.c     2010-09-25 00:32:09 +0000
@@ -3170,7 +3170,9 @@
   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);
     }