diff options
| author | Juanma Barranquero | 2010-09-25 02:32:09 +0200 |
|---|---|---|
| committer | Juanma Barranquero | 2010-09-25 02:32:09 +0200 |
| commit | ba3033ee40a7e4bad9bf7df5a2fc06046b5df08a (patch) | |
| tree | bb8be2b545ca535e0000d2c4313dd4974fde17c7 /lisp/server.el | |
| parent | 61b1af828927139930086a12ef20ff144f82e635 (diff) | |
| download | emacs-ba3033ee40a7e4bad9bf7df5a2fc06046b5df08a.tar.gz emacs-ba3033ee40a7e4bad9bf7df5a2fc06046b5df08a.zip | |
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".
Diffstat (limited to 'lisp/server.el')
| -rw-r--r-- | lisp/server.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/server.el b/lisp/server.el index f0e88d03612..3a48efed7da 100644 --- a/lisp/server.el +++ b/lisp/server.el | |||
| @@ -565,7 +565,7 @@ server or call `M-x server-force-delete' to forcibly disconnect it.") | |||
| 565 | (if server-use-tcp | 565 | (if server-use-tcp |
| 566 | (list :family 'ipv4 ;; We're not ready for IPv6 yet | 566 | (list :family 'ipv4 ;; We're not ready for IPv6 yet |
| 567 | :service t | 567 | :service t |
| 568 | :host (or server-host "127.0.0.1") ;; See bug#6781 | 568 | :host (or server-host 'local) |
| 569 | :plist '(:authenticated nil)) | 569 | :plist '(:authenticated nil)) |
| 570 | (list :family 'local | 570 | (list :family 'local |
| 571 | :service server-file | 571 | :service server-file |