* process.c (Fopen_network_stream): Turn off atimers for duration of call to

connect.  (Patch from Gerd.)

diff --git a/src/ChangeLog b/src/ChangeLog
index 40baf532ef9e7ff17060b12b1c30e4cca58a4ab9..3681d3dddae593cdee2541992b9315186795585b 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2000-06-24  Ken Raeburn  <raeburn@gnu.org>
+
+       * process.c (Fopen_network_stream): Turn off atimers for duration
+       of call to connect.  (Patch from Gerd.)
+
 2000-06-23  Dave Love  <fx@gnu.org>
 
        * ralloc.c: Maybe include unistd.h

diff --git a/src/process.c b/src/process.c
index 6972ba0c255484e1d1eb53ecd5be923a2b7f3cfa..26f3f5e429a6db519b90b3d2682efc6f0ddb8b14 100644 (file)
--- a/src/process.c
+++ b/src/process.c
@@ -1862,7 +1862,16 @@ Fourth arg SERVICE is name of the service desired, or an integer\n\
       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?  */
+      turn_on_atimers (0);
       ret = connect (s, lres->ai_addr, lres->ai_addrlen);
+      turn_on_atimers (1);
       if (ret == 0)
        break;
       emacs_close (s);