From 604cce1812f4b52e12ebaff9858882332100f2d4 Mon Sep 17 00:00:00 2001 From: Przemyslaw Czerpak Date: Wed, 12 May 2010 10:10:54 +0000 Subject: [PATCH] =?UTF-8?q?2010-05-12=2012:10=20UTC+0200=20Przemyslaw=20Cz?= =?UTF-8?q?erpak=20(druzus/at/priv.onet.pl)=20=20=20*=20harbour/contrib/hb?= =?UTF-8?q?netio/netiosrv.c=20=20=20=20=20!=20fixed=20typo=20in=20NETIO=5F?= =?UTF-8?q?SRVSTATUS()=20-=20-2=20was=20always=20returned=20=20=20=20=20?= =?UTF-8?q?=20=20(modification=20committed=20by=20mistake=20in=20my=20prev?= =?UTF-8?q?ious=20commit)=20=20=20=20=20!=20fixed=20to=20return=20.F.=20by?= =?UTF-8?q?=20NETIO=5FSRVSEND{DATA,IETM}()=20if=20hb=5FznetFlush()=20=20?= =?UTF-8?q?=20=20=20=20=20reports=20error.=20=20=20=20=20=20=20Many=20than?= =?UTF-8?q?ks=20for=20Aleksander=20Czajczy=C5=84ski=20for=20information=20?= =?UTF-8?q?about=20problems=20=20=20=20=20=20=20and=20his=20extensive=20te?= =?UTF-8?q?sts.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- harbour/ChangeLog | 9 +++++++++ harbour/contrib/hbnetio/netiosrv.c | 5 ++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 37485a0c29..430b79c8da 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -17,6 +17,15 @@ past entries belonging to author(s): Viktor Szakats. */ +2010-05-12 12:10 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl) + * harbour/contrib/hbnetio/netiosrv.c + ! fixed typo in NETIO_SRVSTATUS() - -2 was always returned + (modification committed by mistake in my previous commit) + ! fixed to return .F. by NETIO_SRVSEND{DATA,IETM}() if hb_znetFlush() + reports error. + Many thanks for Aleksander CzajczyƄski for information about problems + and his extensive tests. + 2010-05-12 09:20 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * utils/hbmk2/hbmk2.pt_BR.po * utils/hbmk2/hbmk2.hu_HU.po diff --git a/harbour/contrib/hbnetio/netiosrv.c b/harbour/contrib/hbnetio/netiosrv.c index 9919a401ae..5dd19ae600 100644 --- a/harbour/contrib/hbnetio/netiosrv.c +++ b/harbour/contrib/hbnetio/netiosrv.c @@ -398,7 +398,10 @@ static long s_srvSendAll( PHB_CONSRV conn, void * buffer, long len ) } } if( conn->zstream && lLast > 0 && !conn->stop ) - hb_znetFlush( conn->zstream, conn->sd, -1 ); + { + if( hb_znetFlush( conn->zstream, conn->sd, -1 ) != 0 ) + lSent = -1; + } if( conn->mutex ) hb_threadMutexUnlock( conn->mutex );