diff options
| author | Lars Ingebrigtsen | 2016-01-30 02:25:08 +0100 |
|---|---|---|
| committer | Lars Ingebrigtsen | 2016-01-30 02:25:08 +0100 |
| commit | e9eb6107dbe3c3fa9671f032cd66030aa77409b0 (patch) | |
| tree | 08dafeeff59029830a00b93bf1be64248812d6ba | |
| parent | 860303cc4d2b783dfbac75d0ebe2f68703c09946 (diff) | |
| download | emacs-e9eb6107dbe3c3fa9671f032cd66030aa77409b0.tar.gz emacs-e9eb6107dbe3c3fa9671f032cd66030aa77409b0.zip | |
Fix server connections
* process.c (Fmake_network_process): Make creating server
listening ports work again.
| -rw-r--r-- | src/process.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/process.c b/src/process.c index e40d7a46267..90e18d72014 100644 --- a/src/process.c +++ b/src/process.c | |||
| @@ -3573,7 +3573,13 @@ usage: (make-network-process &rest ARGS) */) | |||
| 3573 | 3573 | ||
| 3574 | /* :host HOST -- hostname, ip address, or 'local for localhost. */ | 3574 | /* :host HOST -- hostname, ip address, or 'local for localhost. */ |
| 3575 | host = Fplist_get (contact, QChost); | 3575 | host = Fplist_get (contact, QChost); |
| 3576 | if (!NILP (host)) | 3576 | if (NILP (host)) |
| 3577 | { | ||
| 3578 | /* The "connection" function gets it bind info from the address we're | ||
| 3579 | given, so use this dummy address if nothing is specified. */ | ||
| 3580 | host = build_string ("127.0.0.1"); | ||
| 3581 | } | ||
| 3582 | else | ||
| 3577 | { | 3583 | { |
| 3578 | if (EQ (host, Qlocal)) | 3584 | if (EQ (host, Qlocal)) |
| 3579 | /* Depending on setup, "localhost" may map to different IPv4 and/or | 3585 | /* Depending on setup, "localhost" may map to different IPv4 and/or |
| @@ -3810,7 +3816,7 @@ usage: (make-network-process &rest ARGS) */) | |||
| 3810 | 3816 | ||
| 3811 | /* If we're doing async address resolution, the list of addresses | 3817 | /* If we're doing async address resolution, the list of addresses |
| 3812 | here will be nil, so we postpone connecting to the server. */ | 3818 | here will be nil, so we postpone connecting to the server. */ |
| 3813 | if (NILP (ip_addresses)) | 3819 | if (!p->is_server && NILP (ip_addresses)) |
| 3814 | { | 3820 | { |
| 3815 | int channel; | 3821 | int channel; |
| 3816 | 3822 | ||