[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] feature/async-dns e9eb610 3/3: Fix server connections
From: |
Lars Ingebrigtsen |
Subject: |
[Emacs-diffs] feature/async-dns e9eb610 3/3: Fix server connections |
Date: |
Sat, 30 Jan 2016 01:25:17 +0000 |
branch: feature/async-dns
commit e9eb6107dbe3c3fa9671f032cd66030aa77409b0
Author: Lars Ingebrigtsen <address@hidden>
Commit: Lars Ingebrigtsen <address@hidden>
Fix server connections
* process.c (Fmake_network_process): Make creating server
listening ports work again.
---
src/process.c | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/src/process.c b/src/process.c
index e40d7a4..90e18d7 100644
--- a/src/process.c
+++ b/src/process.c
@@ -3573,7 +3573,13 @@ usage: (make-network-process &rest ARGS) */)
/* :host HOST -- hostname, ip address, or 'local for localhost. */
host = Fplist_get (contact, QChost);
- if (!NILP (host))
+ if (NILP (host))
+ {
+ /* The "connection" function gets it bind info from the address we're
+ given, so use this dummy address if nothing is specified. */
+ host = build_string ("127.0.0.1");
+ }
+ else
{
if (EQ (host, Qlocal))
/* Depending on setup, "localhost" may map to different IPv4 and/or
@@ -3810,7 +3816,7 @@ usage: (make-network-process &rest ARGS) */)
/* If we're doing async address resolution, the list of addresses
here will be nil, so we postpone connecting to the server. */
- if (NILP (ip_addresses))
+ if (!p->is_server && NILP (ip_addresses))
{
int channel;