diff options
| author | Phil Mesnier <mesnier_p@ociweb.com> | 2014-04-08 20:08:26 +0000 |
|---|---|---|
| committer | Phil Mesnier <mesnier_p@ociweb.com> | 2014-04-08 20:08:26 +0000 |
| commit | 8285e9955853a2688f479901a67fd715b49be00d (patch) | |
| tree | 6012bcc1aec85ce70d45959df5f57689af2d8000 /ACE/ace/SOCK_Connector.cpp | |
| parent | 1f4864cce35506f4c7cd4180b85b0e624986c6a7 (diff) | |
| download | ATCD-8285e9955853a2688f479901a67fd715b49be00d.tar.gz | |
Tue Apr 8 19:27:23 UTC 2014 Phil Mesnier <mesnier_p@ociweb.com>
* ace/SOCK_Connector.cpp:
Fix to allow the extended connection semantics on windows to be
overridden by adding #define ACE_NON_BLOCKING_BUG_DELAY 0 to
config.h prior to including config-win32.h. The default behavior
is unchanged but in cases where a tight connection timeout is
requested and the application's using local connections on newer
windows platforms, the wait then try again step may be skipped.
Diffstat (limited to 'ACE/ace/SOCK_Connector.cpp')
| -rw-r--r-- | ACE/ace/SOCK_Connector.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ACE/ace/SOCK_Connector.cpp b/ACE/ace/SOCK_Connector.cpp index 0aa949b5c97..e3c672c0843 100644 --- a/ACE/ace/SOCK_Connector.cpp +++ b/ACE/ace/SOCK_Connector.cpp @@ -251,7 +251,7 @@ ACE_SOCK_Connector::complete (ACE_SOCK_Stream &new_stream, // We failed to get connected. if (h == ACE_INVALID_HANDLE) { -#if defined (ACE_WIN32) +#if defined (ACE_NON_BLOCKING_BUG_DELAY) && ACE_NON_BLOCKING_BUG_DELAY > 0 // Win32 has a timing problem - if you check to see if the // connection has completed too fast, it will fail - so wait // <ACE_NON_BLOCKING_BUG_DELAY> microseconds to let it catch up @@ -261,14 +261,14 @@ ACE_SOCK_Connector::complete (ACE_SOCK_Stream &new_stream, h = ACE::handle_timed_complete (new_stream.get_handle (), tv); if (h == ACE_INVALID_HANDLE) { -#endif /* ACE_WIN32 */ +#endif /* ACE_NON_BLOCKING_BUG_DELAY */ // Save/restore errno. ACE_Errno_Guard error (errno); new_stream.close (); return -1; -#if defined (ACE_WIN32) +#if defined (ACE_NON_BLOCKING_BUG_DELAY) && ACE_NON_BLOCKING_BUG_DELAY > 0 } -#endif /* ACE_WIN32 */ +#endif /* ACE_NON_BLOCKING_BUG_DELAY */ } if (remote_sap != 0) |