aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorKen Raeburn2000-06-24 06:06:53 +0000
committerKen Raeburn2000-06-24 06:06:53 +0000
commitb8c2455611f3245dffeb3e2230d8a3d101fd0323 (patch)
treed58fd0019989128759efd1dc65576f55b5a5ffee /src
parentc69e5fcdaeac1b00e02b8ea8bc35333bf207b4a1 (diff)
downloademacs-b8c2455611f3245dffeb3e2230d8a3d101fd0323.tar.gz
emacs-b8c2455611f3245dffeb3e2230d8a3d101fd0323.zip
* process.c (Fopen_network_stream): Turn off atimers for duration of call to
connect. (Patch from Gerd.)
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog5
-rw-r--r--src/process.c9
2 files changed, 14 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 40baf532ef9..3681d3dddae 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
12000-06-24 Ken Raeburn <raeburn@gnu.org>
2
3 * process.c (Fopen_network_stream): Turn off atimers for duration
4 of call to connect. (Patch from Gerd.)
5
12000-06-23 Dave Love <fx@gnu.org> 62000-06-23 Dave Love <fx@gnu.org>
2 7
3 * ralloc.c: Maybe include unistd.h 8 * ralloc.c: Maybe include unistd.h
diff --git a/src/process.c b/src/process.c
index 6972ba0c255..26f3f5e429a 100644
--- 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\
1862 immediate_quit = 1; 1862 immediate_quit = 1;
1863 QUIT; 1863 QUIT;
1864 1864
1865 /* This turns off all alarm-based interrupts; the
1866 bind_polling_period call above doesn't always turn all the
1867 short-interval ones off, especially if interrupt_input is
1868 set.
1869
1870 It'd be nice to be able to control the connect timeout
1871 though. Would non-blocking connect calls be portable? */
1872 turn_on_atimers (0);
1865 ret = connect (s, lres->ai_addr, lres->ai_addrlen); 1873 ret = connect (s, lres->ai_addr, lres->ai_addrlen);
1874 turn_on_atimers (1);
1866 if (ret == 0) 1875 if (ret == 0)
1867 break; 1876 break;
1868 emacs_close (s); 1877 emacs_close (s);