aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYAMAMOTO Mitsuharu2010-03-25 17:56:15 +0900
committerYAMAMOTO Mitsuharu2010-03-25 17:56:15 +0900
commitcad4261fd31b3dec552ffc4dfd66c0b2a19169ce (patch)
treeca9c2b5a8ce8f5c6d63cb54d9d98cf31dba99803
parentcd591dbccd185c8c271f5ee5e01bf7325e370582 (diff)
downloademacs-cad4261fd31b3dec552ffc4dfd66c0b2a19169ce.tar.gz
emacs-cad4261fd31b3dec552ffc4dfd66c0b2a19169ce.zip
Don't call turn_on_atimers around `connect' (Bug#5723).
-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 @@
12010-03-25 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
2
3 * process.c (Fmake_network_process): Don't call turn_on_atimers around
4 `connect' (Bug#5723).
5
12010-03-25 Helmut Eller <eller.helmut@gmail.com> 62010-03-25 Helmut Eller <eller.helmut@gmail.com>
2 7
3 * process.c (Fmake_network_process): Call `select' for interrupted 8 * 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) */)
3615 immediate_quit = 1; 3615 immediate_quit = 1;
3616 QUIT; 3616 QUIT;
3617 3617
3618 /* This turns off all alarm-based interrupts; the
3619 bind_polling_period call above doesn't always turn all the
3620 short-interval ones off, especially if interrupt_input is
3621 set.
3622
3623 It'd be nice to be able to control the connect timeout
3624 though. Would non-blocking connect calls be portable?
3625
3626 This used to be conditioned by HAVE_GETADDRINFO. Why? */
3627
3628 turn_on_atimers (0);
3629
3630 ret = connect (s, lres->ai_addr, lres->ai_addrlen); 3618 ret = connect (s, lres->ai_addr, lres->ai_addrlen);
3631 xerrno = errno; 3619 xerrno = errno;
3632 3620
3633 turn_on_atimers (1);
3634
3635 if (ret == 0 || xerrno == EISCONN) 3621 if (ret == 0 || xerrno == EISCONN)
3636 { 3622 {
3637 /* The unwind-protect will be discarded afterwards. 3623 /* The unwind-protect will be discarded afterwards.