Mercurial > emacs
comparison lisp/server.el @ 110556:310fef3bdbbb
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".
| author | Juanma Barranquero <lekktu@gmail.com> |
|---|---|
| date | Sat, 25 Sep 2010 02:32:09 +0200 |
| parents | c3bbd8f2439e |
| children | 4b5aaeebe785 |
comparison
equal
deleted
inserted
replaced
| 110555:e07971bb896c | 110556:310fef3bdbbb |
|---|---|
| 563 :coding 'raw-text-unix | 563 :coding 'raw-text-unix |
| 564 ;; The other args depend on the kind of socket used. | 564 ;; The other args depend on the kind of socket used. |
| 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 |
| 572 :plist '(:authenticated t))))) | 572 :plist '(:authenticated t))))) |
| 573 (unless server-process (error "Could not start server process")) | 573 (unless server-process (error "Could not start server process")) |