.

5 files changed, 19 insertions, 19 deletions

diff --git a/ChangeLog-99b b/ChangeLog-99b
index a00c9aa0e2e..d538f131d86 100644
--- a/ChangeLog-99b
+++ b/ChangeLog-99b
@@ -1,3 +1,10 @@
+Fri Apr  9 00:38:03 1999  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
+
+	* ace/SOCK_Acceptor.cpp (shared_accept): Make sure to disable
+ 	  ACE_NONBLOCK on the newly accepted socket since otherwise
+ 	  applications can have weird behavior.  Thanks to Margaret Reitz
+ 	  <margaret@veritas.com> and Irfan for helping to track this down.
+
 Thu Apr 08 13:47:03 1999  David L. Levine  <levine@cs.wustl.edu>
 
         * BUG-REPORT-FORM,PROBLEM-REPORT-FORM,
diff --git a/TAO/ChangeLog-99c b/TAO/ChangeLog-99c
index 84b9c7186ec..c0b4a8b0735 100644
--- a/TAO/ChangeLog-99c
+++ b/TAO/ChangeLog-99c
@@ -1,10 +1,3 @@
-Fri Apr  9 00:16:47 1999  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
-
-	* tao/ORB.cpp (multicast_query): Make sure to disable ACE_NONBLOCK
- 	  on the newly accepted socket since it appears that NT sets this
- 	  into non-blocking mode by default...  Thanks to Margaret Reitz
- 	  <margaret@veritas.com> for helping to track this down.
-
 Fri Apr  9 00:04:45 1999  Pradeep Gore  <pradeep@flamenco.cs.wustl.edu>
 
 	* orbsvcs/CosEvent_Service/CosEvent_Service.cpp:
diff --git a/ace/ACE.cpp b/ace/ACE.cpp
index 1dae13086da..4b1f9cb1dc5 100644
--- a/ace/ACE.cpp
+++ b/ace/ACE.cpp
@@ -1878,7 +1878,7 @@ ACE::handle_timed_accept (ACE_HANDLE listener,
           /* NOTREACHED */
         }
     }
-  ACE_NOTREACHED(return 0);
+  ACE_NOTREACHED (return 0);
 }
 
 // Bind socket to an unused port.
diff --git a/ace/Acceptor.cpp b/ace/Acceptor.cpp
index ef5cda76d80..8e7a560b9ae 100644
--- a/ace/Acceptor.cpp
+++ b/ace/Acceptor.cpp
@@ -958,9 +958,8 @@ ACE_Oneshot_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::shared_accept
       return -1;
     }
   // Activate the <svc_handler> using the designated concurrency
-  // strategy (note that this method becomes responsible for
-  // handling errors and freeing up the memory if things go
-  // awry...)
+  // strategy (note that this method becomes responsible for handling
+  // errors and freeing up the memory if things go awry...)
   else
     return this->activate_svc_handler (svc_handler);
 }
@@ -1025,7 +1024,7 @@ ACE_Oneshot_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::handle_input (ACE_HANDLE
 
   // Try to find out if the implementation of the reactor that we are
   // using requires us to reset the event association for the newly
-  // created handle. This is because the newly created handle will
+  // created handle.  This is because the newly created handle will
   // inherit the properties of the listen handle, including its event
   // associations.
   int reset_new_handle = this->reactor ()->uses_event_associations ();
diff --git a/ace/SOCK_Acceptor.cpp b/ace/SOCK_Acceptor.cpp
index a3cfaaa8c0f..f86f37c67b5 100644
--- a/ace/SOCK_Acceptor.cpp
+++ b/ace/SOCK_Acceptor.cpp
@@ -140,7 +140,7 @@ ACE_SOCK_Acceptor::shared_accept (ACE_Addr *remote_addr,
       addr = (sockaddr *) remote_addr->get_addr ();
     }
 
-  // Handle the timeout case.
+  // Handle the case where we're doing a timed <accept>.
   if (timeout != 0)
     {
       if (ACE::handle_timed_accept (handle, timeout, restart) == -1)
@@ -149,8 +149,8 @@ ACE_SOCK_Acceptor::shared_accept (ACE_Addr *remote_addr,
 	{
 	  int val = ACE::get_flags (handle);
 
-	  // Set the handle into non-blocking mode if it's not
-	  // already in it.
+	  // Set the handle into non-blocking mode if it's not already
+	  // in it.
 	  if (ACE_BIT_DISABLED (val, ACE_NONBLOCK)
 	      && ACE::set_flags (handle, ACE_NONBLOCK) == -1)
 	    return ACE_INVALID_HANDLE;
@@ -159,13 +159,14 @@ ACE_SOCK_Acceptor::shared_accept (ACE_Addr *remote_addr,
 
 	  if (ACE_BIT_DISABLED (val, ACE_NONBLOCK))
 	    {
-	      // We need to stash errno here because ACE::clr_flags() may
-	      // reset it.
+	      // We need to stash errno here because <ACE::clr_flags>
+	      // may reset it.
 	      int error = errno;
 
-	      // Only disable ACE_NONBLOCK if we weren't in non-blocking mode
-	      // originally.
+	      // Only disable ACE_NONBLOCK if we weren't in
+	      // non-blocking mode originally.
 	      ACE::clr_flags (handle, ACE_NONBLOCK);
+	      ACE::clr_flags (new_handle, ACE_NONBLOCK);
 	      errno = error;
 	    }
 	}