rs

25 files changed, 103 insertions, 90 deletions

diff --git a/ace/ACE.cpp b/ace/ACE.cpp
index 871f1442688..89ff6ab7308 100644
--- a/ace/ACE.cpp
+++ b/ace/ACE.cpp
@@ -1116,7 +1116,8 @@ ACE::handle_timed_complete (ACE_HANDLE h,
   int n = ACE_OS::select (int (h) + 1,
                           rd_handles,
                           wr_handles,
-                          0, timeout);
+                          0,
+			  timeout);
 #endif /* ACE_WIN32 */
 
   // If we failed to connect within the time period allocated by the
@@ -1124,7 +1125,7 @@ ACE::handle_timed_complete (ACE_HANDLE h,
   // busy to accept our call).
   if (n <= 0)
     {
-      if (n == 0)
+      if (n == 0 && timeout != 0)
         errno = ETIME;
       return ACE_INVALID_HANDLE;
     }
@@ -1133,7 +1134,7 @@ ACE::handle_timed_complete (ACE_HANDLE h,
   // ready for writing, which may indicate a problem.  But we need to
   // make sure...
 #if defined (ACE_WIN32)
-  need_to_check = (rd_handles.is_set (h) || ex_handles.is_set (h));
+  need_to_check = rd_handles.is_set (h) || ex_handles.is_set (h);
 #elif defined (VXWORKS)
   ACE_UNUSED_ARG (is_tli);
 
@@ -1143,7 +1144,7 @@ ACE::handle_timed_complete (ACE_HANDLE h,
   need_to_check = 1;
 #else
   if (is_tli)
-    need_to_check = (rd_handles.is_set (h) && !wr_handles.is_set (h));
+    need_to_check = rd_handles.is_set (h) && !wr_handles.is_set (h);
   else
     need_to_check = rd_handles.is_set (h);
 #endif /* ACE_WIN32 */
@@ -1188,7 +1189,7 @@ ACE::handle_timed_open (ACE_Time_Value *timeout,
           && (errno == EWOULDBLOCK
               && (timeout->sec () > 0 || timeout->usec () > 0)))
         // This expression checks if we were polling.
-        errno = ETIMEDOUT;
+        errno = ETIME;
 
       return handle;
     }
@@ -1230,7 +1231,7 @@ ACE::handle_timed_accept (ACE_HANDLE listener,
           if (timeout != 0 && timeout->sec() == 0 && timeout->usec() == 0)
             errno = EWOULDBLOCK;
           else
-            errno = ETIMEDOUT;
+            errno = ETIME;
           return -1;
           /* NOTREACHED */
         case 1:
diff --git a/ace/Acceptor.cpp b/ace/Acceptor.cpp
index 1b03f190cc5..7273d15f0a4 100644
--- a/ace/Acceptor.cpp
+++ b/ace/Acceptor.cpp
@@ -773,7 +773,7 @@ ACE_Oneshot_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::handle_timeout
    const void *arg)
 {
   ACE_TRACE ("ACE_Oneshot_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::handle_timeout");
-  errno = ETIMEDOUT;
+  errno = ETIME;
 
   if (this->svc_handler_->handle_timeout (tv, arg) == -1)
     this->svc_handler_->handle_close (this->svc_handler_->get_handle (), 
@@ -782,7 +782,7 @@ ACE_Oneshot_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::handle_timeout
   // Since we aren't necessarily registered with the Reactor, don't
   // bother to check the return value here...
   if (this->reactor ())
-        this->reactor ()->remove_handler (this, ACE_Event_Handler::ACCEPT_MASK);
+    this->reactor ()->remove_handler (this, ACE_Event_Handler::ACCEPT_MASK);
   return 0;
 }
 
diff --git a/ace/Connector.cpp b/ace/Connector.cpp
index b7948a66089..d58a0b19c09 100644
--- a/ace/Connector.cpp
+++ b/ace/Connector.cpp
@@ -299,7 +299,7 @@ ACE_Connector<SH, PR_CO_2>::handle_output (ACE_HANDLE handle)
   // Win32 has a timing problem - if you check to see if the
   // connection has completed too fast, it will fail - so wait 35
   // millisecond to let it catch up.
-  ACE_Time_Value tv (0, ACE_OS::NON_BLOCKING_BUG_DELAY);
+  ACE_Time_Value tv (0, ACE_NON_BLOCKING_BUG_DELAY);
   ACE_OS::sleep (tv);
 #endif /* ACE_HAS_BROKEN_NON_BLOCKING_CONNECTS */
 
diff --git a/ace/DEV_Connector.h b/ace/DEV_Connector.h
index c122bae8efa..b5567271efc 100644
--- a/ace/DEV_Connector.h
+++ b/ace/DEV_Connector.h
@@ -42,10 +42,10 @@ public:
   // the connection can't be made immediately the value of -1 is
   // returned with <errno == EWOULDBLOCK>.  If *timeout > {0, 0} then
   // this is the amount of time to wait before timing out.  If the
-  // time expires before the connection is made <errno == ETIMEDOUT>.
-  // The <local_sap> is the value of local address to bind to.  If
-  // it's the default value of <ACE_Addr::sap_any> then the user is
-  // letting the OS do the binding.  If <reuse_addr> == 1 then the
+  // time expires before the connection is made <errno == ETIME>.  The
+  // <local_sap> is the value of local address to bind to.  If it's
+  // the default value of <ACE_Addr::sap_any> then the user is letting
+  // the OS do the binding.  If <reuse_addr> == 1 then the
   // <local_addr> is reused, even if it hasn't been cleanedup yet.
   // The <flags> and <perms> arguments are passed down to the open()
   // method.
@@ -65,10 +65,10 @@ public:
   // the connection can't be made immediately the value of -1 is
   // returned with <errno == EWOULDBLOCK>.  If *timeout > {0, 0} then
   // this is the amount of time to wait before timing out.  If the
-  // time expires before the connection is made <errno == ETIMEDOUT>.
-  // The <local_sap> is the value of local address to bind to.  If
-  // it's the default value of <ACE_Addr::sap_any> then the user is
-  // letting the OS do the binding.  If <reuse_addr> == 1 then the
+  // time expires before the connection is made <errno == ETIME>.  The
+  // <local_sap> is the value of local address to bind to.  If it's
+  // the default value of <ACE_Addr::sap_any> then the user is letting
+  // the OS do the binding.  If <reuse_addr> == 1 then the
   // <local_addr> is reused, even if it hasn't been cleanedup yet.
   // The <flags> and <perms> arguments are passed down to the open()
   // method.
diff --git a/ace/DEV_Connector.i b/ace/DEV_Connector.i
index d8e695b0ba1..53c05674f90 100644
--- a/ace/DEV_Connector.i
+++ b/ace/DEV_Connector.i
@@ -17,7 +17,7 @@ ACE_DEV_Connector::ACE_DEV_Connector (ACE_DEV_IO &new_io,
   ACE_TRACE ("ACE_DEV_Connector::ACE_DEV_Connector");
   if (this->connect (new_io, remote_sap, timeout, local_sap, 
 		     reuse_addr, flags, perms) == ACE_IO_SAP::INVALID_HANDLE
-      && timeout != 0 && !(errno == EWOULDBLOCK || errno == ETIMEDOUT))
+      && timeout != 0 && !(errno == EWOULDBLOCK || errno == ETIME))
     ACE_ERROR ((LM_ERROR, "address %s, %p\n", 
 	       remote_sap.get_path_name (), "ACE_DEV_IO"));
 }
diff --git a/ace/FILE_Connector.h b/ace/FILE_Connector.h
index b7c871d3637..eb366da6c45 100644
--- a/ace/FILE_Connector.h
+++ b/ace/FILE_Connector.h
@@ -44,10 +44,10 @@ public:
   // the connection can't be made immediately the value of -1 is
   // returned with <errno == EWOULDBLOCK>.  If *timeout > {0, 0} then
   // this is the amount of time to wait before timing out.  If the
-  // time expires before the connection is made <errno == ETIMEDOUT>.
-  // The <local_sap> is the value of local address to bind to.  If
-  // it's the default value of <ACE_Addr::sap_any> then the user is
-  // letting the OS do the binding.  If <reuse_addr> == 1 then the
+  // time expires before the connection is made <errno == ETIME>.  The
+  // <local_sap> is the value of local address to bind to.  If it's
+  // the default value of <ACE_Addr::sap_any> then the user is letting
+  // the OS do the binding.  If <reuse_addr> == 1 then the
   // <local_addr> is reused, even if it hasn't been cleanedup yet.
   // The <flags> and <perms> arguments are passed down to the open()
   // method.
@@ -67,10 +67,10 @@ public:
   // the connection can't be made immediately the value of -1 is
   // returned with <errno == EWOULDBLOCK>.  If *timeout > {0, 0} then
   // this is the amount of time to wait before timing out.  If the
-  // time expires before the connection is made <errno == ETIMEDOUT>.
-  // The <local_sap> is the value of local address to bind to.  If
-  // it's the default value of <ACE_Addr::sap_any> then the user is
-  // letting the OS do the binding.  If <reuse_addr> == 1 then the
+  // time expires before the connection is made <errno == ETIME>.  The
+  // <local_sap> is the value of local address to bind to.  If it's
+  // the default value of <ACE_Addr::sap_any> then the user is letting
+  // the OS do the binding.  If <reuse_addr> == 1 then the
   // <local_addr> is reused, even if it hasn't been cleanedup yet.
   // The <flags> and <perms> arguments are passed down to the open()
   // method.
diff --git a/ace/FILE_Connector.i b/ace/FILE_Connector.i
index 04928eaa591..644cfcbe64a 100644
--- a/ace/FILE_Connector.i
+++ b/ace/FILE_Connector.i
@@ -17,7 +17,7 @@ ACE_FILE_Connector::ACE_FILE_Connector (ACE_FILE_IO &new_io,
   ACE_TRACE ("ACE_FILE_Connector::ACE_FILE_Connector");
   if (this->connect (new_io, remote_sap, timeout, local_sap, 
 		     reuse_addr, flags, perms) == ACE_IO_SAP::INVALID_HANDLE
-      && timeout != 0 && !(errno == EWOULDBLOCK || errno == ETIMEDOUT))
+      && timeout != 0 && !(errno == EWOULDBLOCK || errno == ETIME))
     ACE_ERROR ((LM_ERROR, "address %s, %p\n", 
 	       remote_sap.get_path_name (), "ACE_FILE_IO"));
 }
diff --git a/ace/LSOCK_Connector.h b/ace/LSOCK_Connector.h
index 0abd55045f3..3df0d633172 100644
--- a/ace/LSOCK_Connector.h
+++ b/ace/LSOCK_Connector.h
@@ -51,10 +51,10 @@ public:
   // the connection can't be made immediately the value of -1 is
   // returned with <errno == EWOULDBLOCK>.  If *timeout > {0, 0} then
   // this is the amount of time to wait before timing out.  If the
-  // time expires before the connection is made <errno == ETIMEDOUT>.
-  // The <local_sap> is the value of local address to bind to.  If
-  // it's the default value of <ACE_Addr::sap_any> then the user is
-  // letting the OS do the binding.  If <reuse_addr> == 1 then the
+  // time expires before the connection is made <errno == ETIME>.  The
+  // <local_sap> is the value of local address to bind to.  If it's
+  // the default value of <ACE_Addr::sap_any> then the user is letting
+  // the OS do the binding.  If <reuse_addr> == 1 then the
   // <local_addr> is reused, even if it hasn't been cleanedup yet.
 
   int connect (ACE_LSOCK_Stream &new_stream, 
@@ -74,10 +74,10 @@ public:
   // the connection can't be made immediately the value of -1 is
   // returned with <errno == EWOULDBLOCK>.  If *timeout > {0, 0} then
   // this is the amount of time to wait before timing out.  If the
-  // time expires before the connection is made <errno == ETIMEDOUT>.
-  // The <local_sap> is the value of local address to bind to.  If
-  // it's the default value of <ACE_Addr::sap_any> then the user is
-  // letting the OS do the binding.  If <reuse_addr> == 1 then the
+  // time expires before the connection is made <errno == ETIME>.  The
+  // <local_sap> is the value of local address to bind to.  If it's
+  // the default value of <ACE_Addr::sap_any> then the user is letting
+  // the OS do the binding.  If <reuse_addr> == 1 then the
   // <local_addr> is reused, even if it hasn't been cleanedup yet.
 
   // = Meta-type info
diff --git a/ace/Managed_Object.h b/ace/Managed_Object.h
index e872181dd42..f1eb08ffe8c 100644
--- a/ace/Managed_Object.h
+++ b/ace/Managed_Object.h
@@ -40,6 +40,7 @@ public:
 
   TYPE &object (void);
   // Accessor for contained object.
+
 private:
   TYPE object_;
   // Contained object.
@@ -89,14 +90,12 @@ class ACE_Managed_Object
   //     the ACE library.
 {
 public:
-  static
-  TYPE *get_preallocated_object (ACE_Object_Manager::Preallocated_Object id);
+  static TYPE *get_preallocated_object (ACE_Object_Manager::Preallocated_Object id);
   // Get the preallocated object identified by "id".  Returns a
   // pointer to the object.  Beware: no error indication is provided,
   // because it can _only_ be used for accessing preallocated objects.
 
-  static
-  TYPE *get_preallocated_array (ACE_Object_Manager::Preallocated_Array id);
+  static TYPE *get_preallocated_array (ACE_Object_Manager::Preallocated_Array id);
   // Get the preallocated array identified by "id".  Returns a
   // pointer to the array.  Beware: no error indication is provided,
   // because it can _only_ be used for accessing preallocated arrays.
diff --git a/ace/OS.h b/ace/OS.h
index f0d1e45d465..d3e7a73f9c0 100644
--- a/ace/OS.h
+++ b/ace/OS.h
@@ -289,6 +289,13 @@
 // block is left. The old state will then be restored Only used for
 // Win32 (in the moment).
 #if defined (ACE_WIN32)
+
+// This is necessary to work around bugs with Win32 non-blocking
+// connects...
+#if !defined (ACE_NON_BLOCKING_BUG_DELAY)
+#define ACE_NON_BLOCKING_BUG_DELAY 35000
+#endif /* ACE_NON_BLOCKING_BUG_DELAY */
+  
 #if defined (_DEBUG)
 class ACE_No_Heap_Check 
 {
@@ -3135,8 +3142,6 @@ class ACE_Export ACE_OS
   //     <ACE_Log_Msg::restart> flag is enabled).
 {
 public:
-  enum { NON_BLOCKING_BUG_DELAY = 35000 };
-  
   struct ace_flock_t
     // = TITLE
     //     OS file locking structure.
diff --git a/ace/OS.i b/ace/OS.i
index c97cdd29be9..629b3e0c9f4 100644
--- a/ace/OS.i
+++ b/ace/OS.i
@@ -1845,7 +1845,8 @@ ACE_OS::cond_timedwait (ACE_cond_t *cv,
               int, -1, result);
 #  endif /* ACE_HAS_DCE_DRAFT4_THREADS */
   // We need to adjust this to make the POSIX and Solaris return
-  // values consistent.  EAGAIN is from DCE DRAFT4 (HP-UX 10.20 and down).
+  // values consistent.  EAGAIN is from DCE DRAFT4 (HP-UX 10.20 and
+  // down).
   if (result == -1 && (errno == ETIMEDOUT || errno == EAGAIN))
     errno = ETIME;
 
diff --git a/ace/Object_Manager.h b/ace/Object_Manager.h
index 3fc63e46d1d..e7d619693de 100644
--- a/ace/Object_Manager.h
+++ b/ace/Object_Manager.h
@@ -207,10 +207,12 @@ private:
 public:
   // For internal use only by ACE_Managed_Objects.
 
-  ACE_MT (ACE_Thread_Mutex *lock_);
+# if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0)
+  ACE_Thread_Mutex *lock_;
   // Lock that is used to guard internal structures.  Just a pointer
   // is declared here in order to minimize the headers that this one
   // includes.
+#endif /* ACE_MT_SAFE */
 
   static ACE_Object_Manager *instance (void);
   // Accessor to singleton instance.  Because static member functions
diff --git a/ace/Proactor.cpp b/ace/Proactor.cpp
index 8c68146ad20..12f201b7e85 100644
--- a/ace/Proactor.cpp
+++ b/ace/Proactor.cpp
@@ -534,7 +534,7 @@ ACE_Proactor::handle_events (unsigned long milli_seconds)
       // @@  What's the WIN32 constant for timeout (258)?!?!?!
       if (errno == 258)
 	{
-	  errno = ETIMEDOUT;
+	  errno = ETIME;
 	  return 0;
 	}
       else
@@ -542,9 +542,10 @@ ACE_Proactor::handle_events (unsigned long milli_seconds)
     }
   else
     {
-      // Narrow result
+      // Narrow the result.
       ACE_Asynch_Result *asynch_result = (ACE_Asynch_Result *) overlapped;
-      // If errors happen, grab the error
+
+      // If errors happen, grab the error.
       if (result == FALSE)
 	errno = ::GetLastError ();
       
diff --git a/ace/SOCK_Connector.cpp b/ace/SOCK_Connector.cpp
index 3b28e038933..a81925da9c8 100644
--- a/ace/SOCK_Connector.cpp
+++ b/ace/SOCK_Connector.cpp
@@ -86,7 +86,7 @@ ACE_SOCK_Connector::connect (ACE_SOCK_Stream &new_stream,
   if (result != -1 || errno == EISCONN)
     // Start out with non-blocking disabled on the <new_stream>.
     new_stream.disable (ACE_NONBLOCK);
-  else if (!(errno == EWOULDBLOCK || errno == ETIMEDOUT))
+  else if (!(errno == EWOULDBLOCK || errno == ETIME))
     {
       // If things have gone wrong, close down and return an error.
       int saved_errno = errno;
@@ -109,14 +109,17 @@ ACE_SOCK_Connector::complete (ACE_SOCK_Stream &new_stream,
   // Win32 has a timing problem - if you check to see if the
   // connection has completed too fast, it will fail - so wait 1
   // millisecond to let it catch up.
-  ACE_Time_Value time (0, ACE_OS::NON_BLOCKING_BUG_DEALY);
+  ACE_Time_Value time (0, ACE_NON_BLOCKING_BUG_DEALY);
   ACE_OS::sleep (time);
 #endif /* ACE_HAS_BROKEN_NON_BLOCKING_CONNECTS */
   ACE_HANDLE h = ACE::handle_timed_complete (new_stream.get_handle (), tv);
 
   if (h == ACE_INVALID_HANDLE)
     {
+      // Preserve the value of errno across the close() call.
+      int error = errno;
       new_stream.close ();
+      errno = error;
       return -1;
     }
   else 	  // We've successfully connected!
@@ -130,14 +133,16 @@ ACE_SOCK_Connector::complete (ACE_SOCK_Stream &new_stream,
 
 	  if (ACE_OS::getpeername (h, addr, &len) == -1)
 	    {
+	      // Preserve the value of errno across the close() call.
+	      int error = errno;
 	      new_stream.close ();
+	      errno = error;
 	      return -1;
 	    }
 	}
 
       // Start out with non-blocking disabled on the <new_stream>.
       new_stream.disable (ACE_NONBLOCK);
-
       return 0;
     }
 }
diff --git a/ace/SOCK_Connector.h b/ace/SOCK_Connector.h
index 6544e9a08d1..472da3cb47a 100644
--- a/ace/SOCK_Connector.h
+++ b/ace/SOCK_Connector.h
@@ -50,10 +50,10 @@ public:
   // the connection can't be made immediately the value of -1 is
   // returned with <errno == EWOULDBLOCK>.  If *timeout > {0, 0} then
   // this is the amount of time to wait before timing out.  If the
-  // time expires before the connection is made <errno == ETIMEDOUT>.
-  // The <local_sap> is the value of local address to bind to.  If
-  // it's the default value of <ACE_Addr::sap_any> then the user is
-  // letting the OS do the binding.  If <reuse_addr> == 1 then the
+  // time expires before the connection is made <errno == ETIME>.  The
+  // <local_sap> is the value of local address to bind to.  If it's
+  // the default value of <ACE_Addr::sap_any> then the user is letting
+  // the OS do the binding.  If <reuse_addr> == 1 then the
   // <local_addr> is reused, even if it hasn't been cleanedup yet.
 
   int connect (ACE_SOCK_Stream &new_stream, 
@@ -73,10 +73,10 @@ public:
   // the connection can't be made immediately the value of -1 is
   // returned with <errno == EWOULDBLOCK>.  If *timeout > {0, 0} then
   // this is the amount of time to wait before timing out.  If the
-  // time expires before the connection is made <errno == ETIMEDOUT>.
-  // The <local_sap> is the value of local address to bind to.  If
-  // it's the default value of <ACE_Addr::sap_any> then the user is
-  // letting the OS do the binding.  If <reuse_addr> == 1 then the
+  // time expires before the connection is made <errno == ETIME>.  The
+  // <local_sap> is the value of local address to bind to.  If it's
+  // the default value of <ACE_Addr::sap_any> then the user is letting
+  // the OS do the binding.  If <reuse_addr> == 1 then the
   // <local_addr> is reused, even if it hasn't been cleanedup yet.
 
   // = Completion routine.
diff --git a/ace/SOCK_Connector.i b/ace/SOCK_Connector.i
index 8c24fae6988..a0455c14dae 100644
--- a/ace/SOCK_Connector.i
+++ b/ace/SOCK_Connector.i
@@ -20,7 +20,7 @@ ACE_SOCK_Connector::ACE_SOCK_Connector (ACE_SOCK_Stream &new_stream,
   ACE_TRACE ("ACE_SOCK_Connector::ACE_SOCK_Connector");
   if (this->connect (new_stream, remote_sap, timeout, local_sap,
 		     reuse_addr, flags, perms, protocol_family, protocol) == -1
-      && timeout != 0 && !(errno == EWOULDBLOCK || errno == ETIMEDOUT))
+      && timeout != 0 && !(errno == EWOULDBLOCK || errno == ETIME))
     ACE_ERROR ((LM_ERROR, "%p\n", "ACE_SOCK_Connector::ACE_SOCK_Connector"));
 }
 
diff --git a/ace/SPIPE_Connector.cpp b/ace/SPIPE_Connector.cpp
index 05fdf7665ea..947a888076c 100644
--- a/ace/SPIPE_Connector.cpp
+++ b/ace/SPIPE_Connector.cpp
@@ -19,7 +19,7 @@ ACE_SPIPE_Connector::ACE_SPIPE_Connector (ACE_SPIPE_Stream &new_io,
   ACE_TRACE ("ACE_SPIPE_Connector::ACE_SPIPE_Connector");
   if (this->connect (new_io, remote_sap, timeout, local_sap, 
 		     reuse_addr, flags, perms) == -1
-      && timeout != 0 && !(errno == EWOULDBLOCK || errno == ETIMEDOUT))
+      && timeout != 0 && !(errno == EWOULDBLOCK || errno == ETIME))
     ACE_ERROR ((LM_ERROR, "address %s, %p\n", 
 	       remote_sap.get_path_name (), "ACE_SPIPE_Connector"));
 }
diff --git a/ace/SPIPE_Connector.h b/ace/SPIPE_Connector.h
index 35dab9bcf43..b3416f7cfd6 100644
--- a/ace/SPIPE_Connector.h
+++ b/ace/SPIPE_Connector.h
@@ -45,10 +45,10 @@ public:
   // the connection can't be made immediately the value of -1 is
   // returned with <errno == EWOULDBLOCK>.  If *timeout > {0, 0} then
   // this is the amount of time to wait before timing out.  If the
-  // time expires before the connection is made <errno == ETIMEDOUT>.
-  // The <local_sap> is the value of local address to bind to.  If
-  // it's the default value of <ACE_Addr::sap_any> then the user is
-  // letting the OS do the binding.  If <reuse_addr> == 1 then the
+  // time expires before the connection is made <errno == ETIME>.  The
+  // <local_sap> is the value of local address to bind to.  If it's
+  // the default value of <ACE_Addr::sap_any> then the user is letting
+  // the OS do the binding.  If <reuse_addr> == 1 then the
   // <local_addr> is reused, even if it hasn't been cleanedup yet.
   // The <flags> and <perms> arguments are passed down to the open()
   // method.
@@ -68,10 +68,10 @@ public:
   // the connection can't be made immediately the value of -1 is
   // returned with <errno == EWOULDBLOCK>.  If *timeout > {0, 0} then
   // this is the amount of time to wait before timing out.  If the
-  // time expires before the connection is made <errno == ETIMEDOUT>.
-  // The <local_sap> is the value of local address to bind to.  If
-  // it's the default value of <ACE_Addr::sap_any> then the user is
-  // letting the OS do the binding.  If <reuse_addr> == 1 then the
+  // time expires before the connection is made <errno == ETIME>.  The
+  // <local_sap> is the value of local address to bind to.  If it's
+  // the default value of <ACE_Addr::sap_any> then the user is letting
+  // the OS do the binding.  If <reuse_addr> == 1 then the
   // <local_addr> is reused, even if it hasn't been cleanedup yet.
   // The <flags> and <perms> arguments are passed down to the open()
   // method.
diff --git a/ace/TLI_Connector.cpp b/ace/TLI_Connector.cpp
index 8dfe1979f39..2d628f84dd0 100644
--- a/ace/TLI_Connector.cpp
+++ b/ace/TLI_Connector.cpp
@@ -151,7 +151,7 @@ ACE_TLI_Connector::connect (ACE_TLI_Stream &new_stream,
 	result = ACE_OS::ioctl (new_stream.get_handle (), I_PUSH, "tirdwr");
 #endif /* I_PUSH */
     }
-  else if (!(errno == EWOULDBLOCK || errno == ETIMEDOUT))
+  else if (!(errno == EWOULDBLOCK || errno == ETIME))
     {
       // If things have gone wrong, close down and return an error.
       this->close ();
diff --git a/ace/TLI_Connector.h b/ace/TLI_Connector.h
index 5714450e380..4036943eb54 100644
--- a/ace/TLI_Connector.h
+++ b/ace/TLI_Connector.h
@@ -1,7 +1,6 @@
 /* -*- C++ -*- */
 // $Id$
 
-
 // ============================================================================
 //
 // = LIBRARY
@@ -51,10 +50,10 @@ public:
   // the connection can't be made immediately the value of -1 is
   // returned with <errno == EWOULDBLOCK>.  If *timeout > {0, 0} then
   // this is the amount of time to wait before timing out.  If the
-  // time expires before the connection is made <errno == ETIMEDOUT>.
-  // The <local_sap> is the value of local address to bind to.  If
-  // it's the default value of <ACE_Addr::sap_any> then the user is
-  // letting the OS do the binding.  If <reuse_addr> == 1 then the
+  // time expires before the connection is made <errno == ETIME>.  The
+  // <local_sap> is the value of local address to bind to.  If it's
+  // the default value of <ACE_Addr::sap_any> then the user is letting
+  // the OS do the binding.  If <reuse_addr> == 1 then the
   // <local_addr> is reused, even if it hasn't been cleanedup yet.
 
   int connect (ACE_TLI_Stream &new_stream, 
@@ -77,10 +76,10 @@ public:
   // the connection can't be made immediately the value of -1 is
   // returned with <errno == EWOULDBLOCK>.  If *timeout > {0, 0} then
   // this is the amount of time to wait before timing out.  If the
-  // time expires before the connection is made <errno == ETIMEDOUT>.
-  // The <local_sap> is the value of local address to bind to.  If
-  // it's the default value of <ACE_Addr::sap_any> then the user is
-  // letting the OS do the binding.  If <reuse_addr> == 1 then the
+  // time expires before the connection is made <errno == ETIME>.  The
+  // <local_sap> is the value of local address to bind to.  If it's
+  // the default value of <ACE_Addr::sap_any> then the user is letting
+  // the OS do the binding.  If <reuse_addr> == 1 then the
   // <local_addr> is reused, even if it hasn't been cleanedup yet.
 
   int complete (ACE_TLI_Stream &new_stream, 
diff --git a/ace/TLI_Connector.i b/ace/TLI_Connector.i
index 1ad9d12e9f2..f33b059b2af 100644
--- a/ace/TLI_Connector.i
+++ b/ace/TLI_Connector.i
@@ -22,7 +22,7 @@ ACE_TLI_Connector::ACE_TLI_Connector (ACE_TLI_Stream &new_stream,
 		     flags, perms, device, 
 		     info, rwf,
 		     udata, opt) == ACE_INVALID_HANDLE
-      && timeout != 0 && !(errno == EWOULDBLOCK || errno == ETIMEDOUT))
+      && timeout != 0 && !(errno == EWOULDBLOCK || errno == ETIME))
     ACE_ERROR ((LM_ERROR, "%p\n", "ACE_TLI_Stream::ACE_TLI_Stream"));
 }
 
diff --git a/ace/UPIPE_Connector.h b/ace/UPIPE_Connector.h
index 32e72c6bebb..1819f67f2b6 100644
--- a/ace/UPIPE_Connector.h
+++ b/ace/UPIPE_Connector.h
@@ -48,10 +48,10 @@ public:
   // the connection can't be made immediately the value of -1 is
   // returned with <errno == EWOULDBLOCK>.  If *timeout > {0, 0} then
   // this is the amount of time to wait before timing out.  If the
-  // time expires before the connection is made <errno == ETIMEDOUT>.
-  // The <local_sap> is the value of local address to bind to.  If
-  // it's the default value of <ACE_Addr::sap_any> then the user is
-  // letting the OS do the binding.  If <reuse_addr> == 1 then the
+  // time expires before the connection is made <errno == ETIME>.  The
+  // <local_sap> is the value of local address to bind to.  If it's
+  // the default value of <ACE_Addr::sap_any> then the user is letting
+  // the OS do the binding.  If <reuse_addr> == 1 then the
   // <local_addr> is reused, even if it hasn't been cleanedup yet.
   // The <flags> and <perms> arguments are passed down to the open()
   // method.
@@ -71,10 +71,10 @@ public:
   // the connection can't be made immediately the value of -1 is
   // returned with <errno == EWOULDBLOCK>.  If *timeout > {0, 0} then
   // this is the amount of time to wait before timing out.  If the
-  // time expires before the connection is made <errno == ETIMEDOUT>.
-  // The <local_sap> is the value of local address to bind to.  If
-  // it's the default value of <ACE_Addr::sap_any> then the user is
-  // letting the OS do the binding.  If <reuse_addr> == 1 then the
+  // time expires before the connection is made <errno == ETIME>.  The
+  // <local_sap> is the value of local address to bind to.  If it's
+  // the default value of <ACE_Addr::sap_any> then the user is letting
+  // the OS do the binding.  If <reuse_addr> == 1 then the
   // <local_addr> is reused, even if it hasn't been cleanedup yet.
   // The <flags> and <perms> arguments are passed down to the open()
   // method.
diff --git a/ace/UPIPE_Connector.i b/ace/UPIPE_Connector.i
index 480305b61da..7cf670caf04 100644
--- a/ace/UPIPE_Connector.i
+++ b/ace/UPIPE_Connector.i
@@ -17,7 +17,7 @@ ACE_UPIPE_Connector::ACE_UPIPE_Connector (ACE_UPIPE_Stream &new_stream,
   ACE_TRACE ("ACE_UPIPE_Connector::ACE_UPIPE_Connector");
   if (this->connect (new_stream, addr, timeout, local_sap, 
 		     reuse_addr, flags, perms) == -1
-      && timeout != 0 && !(errno == EWOULDBLOCK || errno == ETIMEDOUT))
+      && timeout != 0 && !(errno == EWOULDBLOCK || errno == ETIME))
     ACE_ERROR ((LM_ERROR, "address %s, %p\n", 
 	       addr.get_path_name (), "ACE_UPIPE_Connector"));
 }
diff --git a/tests/Conn_Test.cpp b/tests/Conn_Test.cpp
index 995ba80f123..e9a6c239887 100644
--- a/tests/Conn_Test.cpp
+++ b/tests/Conn_Test.cpp
@@ -427,7 +427,7 @@ server (void *arg)
 
   if (result == -1)
     {
-      if (errno == ETIMEDOUT)
+      if (errno == ETIME)
 	ACE_ERROR ((LM_DEBUG,
 		    "(%P|%t) accept timedout, shutting down\n"));
       else
diff --git a/tests/SOCK_Connector_Test.cpp b/tests/SOCK_Connector_Test.cpp
index c483dfa8d36..a964367bbe3 100644
--- a/tests/SOCK_Connector_Test.cpp
+++ b/tests/SOCK_Connector_Test.cpp
@@ -100,8 +100,8 @@ fail_no_listener_nonblocking (void)
 	}
       else if (errno != ECONNREFUSED && errno != ENOTCONN)
 	{
-	  ACE_DEBUG ((LM_DEBUG, "%p, but expected ECONNREFUSED or ENOTCONN\n",
-		      "Failed with"));
+	  ACE_DEBUG ((LM_DEBUG, "%p at errno %d, but expected ECONNREFUSED or ENOTCONN\n",
+		      "Failed with", errno));
 	  status = -1;
 	}
       else