Backport 2010-03-25T08:56:15Z!mituharu@math.s.chiba-u.ac.jp from trunk

2 files changed, 5 insertions, 14 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index f3bbfe05dac..1420114ea5b 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 77490adaa79..e3622c79386 100644
--- a/src/process.c
+++ b/src/process.c
@@ -3654,23 +3654,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.