X-Git-Url: http://git.tdb.fi/?p=libs%2Fnet.git;a=blobdiff_plain;f=source%2Fnet%2Fclientsocket.cpp;fp=source%2Fnet%2Fclientsocket.cpp;h=7987f4b82bce50212ab23cbe1be573a71ef796d6;hp=fbbd2415c693911b88063f0091600d0d3e73f25a;hb=63432878fc84bc666bb74efaeee588fa6d03d5b2;hpb=593c8202bf8c6ecc563aaacf0811aef953b45f09

diff --git a/source/net/clientsocket.cpp b/source/net/clientsocket.cpp
index fbbd241..7987f4b 100644
--- a/source/net/clientsocket.cpp
+++ b/source/net/clientsocket.cpp
@@ -3,6 +3,8 @@
 #include <msp/core/systemerror.h>
 #include "socket_private.h"
 
+using namespace std;
+
 namespace Msp {
 namespace Net {
 
@@ -75,15 +77,18 @@ size_t ClientSocket::do_read(char *buf, size_t size)
 	if(size==0)
 		return 0;
 
-	size_t ret = check_sys_error(::recv(priv->handle, buf, size, 0), "recv");
-	if(ret==0 && !eof_flag)
+	make_signed<size_t>::type ret = ::recv(priv->handle, buf, size, 0);
+	if(ret==0)
 	{
-		eof_flag = true;
-		set_socket_events(S_NONE);
-		signal_end_of_file.emit();
+		if(!eof_flag)
+		{
+			set_socket_events(S_NONE);
+			set_eof();
+		}
+		return 0;
 	}
 
-	return ret;
+	return check_sys_error(ret, "recv");
 }
 
 } // namespace Net