[Emacs-diffs] /srv/bzr/emacs/emacs-23 r99962: * server.el (server-start): Force IPv4 and use literal 127.0.0.1.

[Juanma Barranquero]

------------------------------------------------------------
revno: 99962
committer: Juanma Barranquero <address@hidden>
branch nick: emacs-23
timestamp: Tue 2010-08-03 15:04:20 +0200
message:
  * server.el (server-start): Force IPv4 and use literal 127.0.0.1.
modified:
  lisp/ChangeLog
  lisp/server.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2010-08-02 14:23:50 +0000
+++ b/lisp/ChangeLog    2010-08-03 13:04:20 +0000
@@ -1,3 +1,8 @@
+2010-08-03  Juanma Barranquero  <address@hidden>
+
+       * 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  <address@hidden>
 
        * bindings.el (complete-symbol): Run completion-at-point as a fallback.

=== modified file 'lisp/server.el'
--- a/lisp/server.el    2010-01-13 08:35:10 +0000
+++ b/lisp/server.el    2010-08-03 13:04:20 +0000
@@ -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