summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorschmidt <douglascraigschmidt@users.noreply.github.com>2003-06-24 19:59:31 +0000
committerschmidt <douglascraigschmidt@users.noreply.github.com>2003-06-24 19:59:31 +0000
commit15c42fd980cc1da361c06c4f99d5f05a0023a250 (patch)
treea0c92522884e4ee376723398cccd084fb8a42e4b
parent07dad2ddd33ebdf5dd3e1d7180adac44d4db4170 (diff)
downloadATCD-15c42fd980cc1da361c06c4f99d5f05a0023a250.tar.gz
ChangeLogTag:Tue Jun 24 13:10:25 2003 Douglas C. Schmidt <schmidt@tango.doc.wustl.edu>
-rw-r--r--ChangeLog7
-rw-r--r--THANKS1
-rw-r--r--ace/Cached_Connect_Strategy_T.cpp2
3 files changed, 9 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 23ad7ae0666..36fc98f6051 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Tue Jun 24 13:10:25 2003 Douglas C. Schmidt <schmidt@tango.doc.wustl.edu>
+
+ * ace/Cached_Connect_Strategy_T.cpp (cached_connect): Added
+ a check for "|| errno == EADDRINUSE" to fix problems on Windows.
+ Thanks to Valery Salamakha <ccapstan@bigpond.net.au> for
+ reporting this.
+
Tue Jun 24 12:07:06 2003 Chad Elliott <elliott_c@ociweb.com>
* bin/MakeProjectCreator/modules/ProjectCreator.pm:
diff --git a/THANKS b/THANKS
index 96f449dd25f..d5f71278199 100644
--- a/THANKS
+++ b/THANKS
@@ -1728,6 +1728,7 @@ Jesse Greenwald <jesse@cis.ksu.edu>
Raymond Hoofman <raymond@charm.nl>
Jason Smith <jason@atdesk.com>
Danta Cannarozzi <djc2@cse.wustl.edu>
+Valery Salamakha <ccapstan@bigpond.net.au>
I would particularly like to thank Paul Stephenson, who worked with me
at Ericsson in the early 1990's. Paul devised the recursive Makefile
diff --git a/ace/Cached_Connect_Strategy_T.cpp b/ace/Cached_Connect_Strategy_T.cpp
index 0086f9d001f..8b186910ad3 100644
--- a/ace/Cached_Connect_Strategy_T.cpp
+++ b/ace/Cached_Connect_Strategy_T.cpp
@@ -278,7 +278,7 @@ ACE_Cached_Connect_Strategy_Ex<ACE_T2>::cached_connect (SVC_HANDLER *&sh,
if (errno == EWOULDBLOCK)
errno = ENOTSUP;
- else if (ACE::out_of_handles (errno))
+ else if (ACE::out_of_handles (errno) || errno == EADDRINUSE)
{
// If the connect failed due to the process running out of
// file descriptors then, auto_purging of some connections