diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | ace/SOCK_Stream.cpp | 7 |
2 files changed, 6 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog index c765abbafb0..0d823ccf2ed 100644 --- a/ChangeLog +++ b/ChangeLog @@ -4,10 +4,6 @@ Thu Jun 16 07:38:57 2005 Douglas C. Schmidt <schmidt@cs.wustl.edu> the PID is valid. Thanks to Howard Finer <hfiner at sonusnet dot com> for contributing this. - * ace/SOCK_Stream.cpp (close): Added a call to ACE_OS::shutdown() - to force exit from ongoing operations. Thanks to Howard Finer - <hfiner at sonusnet dot com> for contributing this. - * ace/Pipe.h (ACE_Pipe): Updated the documentation for this class to clarify why it uses sockets on Windows. Thanks to Dave Varnell <Dave.Varvell@ni.com> for prompting this. diff --git a/ace/SOCK_Stream.cpp b/ace/SOCK_Stream.cpp index 77feed6c819..14bb794288e 100644 --- a/ace/SOCK_Stream.cpp +++ b/ace/SOCK_Stream.cpp @@ -30,10 +30,15 @@ ACE_SOCK_Stream::close (void) // this will cause subtle problems on UNIX due to the way that // fork() works. this->close_writer (); -#endif /* ACE_WIN32 */ +#else +#if 0 + // Commenting this out for now since I think it will cause subtle + // problems on UNIX due to the way that fork() works. // Shutdown the socket to force exit from ongoing operations ACE_OS::shutdown (this->get_handle (), SHUT_RDWR); +#endif /* 0 */ +#endif /* ACE_WIN32 */ // Close down the socket. return ACE_SOCK::close (); |