summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorYAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>2010-03-25 17:56:15 +0900
committerYAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>2010-03-25 17:56:15 +0900
commitcad4261fd31b3dec552ffc4dfd66c0b2a19169ce (patch)
treeca9c2b5a8ce8f5c6d63cb54d9d98cf31dba99803 /src
parentcd591dbccd185c8c271f5ee5e01bf7325e370582 (diff)
Don't call turn_on_atimers around `connect' (Bug#5723).
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog5
-rw-r--r--src/process.c14
2 files changed, 5 insertions, 14 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 870c805a92c..789a4d93e44 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2010-03-25 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
+
+ * process.c (Fmake_network_process): Don't call turn_on_atimers around
+ `connect' (Bug#5723).
+
2010-03-25 Helmut Eller <eller.helmut@gmail.com>
* process.c (Fmake_network_process): Call `select' for interrupted
diff --git a/src/process.c b/src/process.c
index 789befc2a6b..268a3ad7bab 100644
--- a/src/process.c
+++ b/src/process.c
@@ -3615,23 +3615,9 @@ usage: (make-network-process &rest ARGS) */)
immediate_quit = 1;
QUIT;
- /* This turns off all alarm-based interrupts; the
- bind_polling_period call above doesn't always turn all the
- short-interval ones off, especially if interrupt_input is
- set.
-
- It'd be nice to be able to control the connect timeout
- though. Would non-blocking connect calls be portable?
-
- This used to be conditioned by HAVE_GETADDRINFO. Why? */
-
- turn_on_atimers (0);
-
ret = connect (s, lres->ai_addr, lres->ai_addrlen);
xerrno = errno;
- turn_on_atimers (1);
-
if (ret == 0 || xerrno == EISCONN)
{
/* The unwind-protect will be discarded afterwards.