]> git.eshelyaron.com Git - emacs.git/commitdiff
Don't call turn_on_atimers around `connect' (Bug#5723).
authorYAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
Thu, 25 Mar 2010 08:56:15 +0000 (17:56 +0900)
committerYAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
Thu, 25 Mar 2010 08:56:15 +0000 (17:56 +0900)
src/ChangeLog
src/process.c

index 870c805a92c7aa5bd7e8f2208f715a035271fb83..789a4d93e44b871d36e99e2abe0ae69499658771 100644 (file)
@@ -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
index 789befc2a6b287fb8ac6064366c2dcf8b29ad604..268a3ad7babecabf87bef61f6e7bd518f36489f7 100644 (file)
@@ -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.