From 0b4c999bb5e88c5645a5bc8391f0bd7ff3ce1ddd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Przemys=C5=82aw=20Czerpak?= Date: Mon, 26 Aug 2013 15:51:57 +0200 Subject: [PATCH] 2013-08-26 15:51 UTC+0200 Przemyslaw Czerpak (druzus/at/poczta.onet.pl) * src/rtl/hbsocket.c ! fixed hb_socketConnect() with timeout in DOS Watt-32 builds. Watt-32 sets socket error to EISCONN when connection is established. --- ChangeLog.txt | 5 +++++ src/rtl/hbsocket.c | 4 ++++ 2 files changed, 9 insertions(+) diff --git a/ChangeLog.txt b/ChangeLog.txt index 8378cc49f3..4db05844f9 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -10,6 +10,11 @@ * Change, ! Fix, % Optimization, + Addition, - Removal, ; Comment */ +2013-08-26 15:51 UTC+0200 Przemyslaw Czerpak (druzus/at/poczta.onet.pl) + * src/rtl/hbsocket.c + ! fixed hb_socketConnect() with timeout in DOS Watt-32 builds. + Watt-32 sets socket error to EISCONN when connection is established. + 2013-08-23 14:25 UTC+0200 Przemyslaw Czerpak (druzus/at/poczta.onet.pl) * src/rtl/fstemp.c ! fixed casting for DOS C++ builds diff --git a/src/rtl/hbsocket.c b/src/rtl/hbsocket.c index 7e0587d833..8726945b0f 100644 --- a/src/rtl/hbsocket.c +++ b/src/rtl/hbsocket.c @@ -1650,6 +1650,10 @@ static int hb_socketSelectWRE( HB_SOCKET sd, HB_MAXINT timeout ) iResult = -1; iError = HB_SOCK_GETERROR(); } +#if defined( HB_OS_DOS ) + else if( iError == EISCONN ) + iError = 0; +#endif else if( iError != 0 ) iResult = -1;