** forwardport of rev 4760 from 1.0 branch **

Author: Jakob Schröter

ChangeLog

@@ -21,6 +21,7 @@ Note: This release is not binary compatible with previous releases. It is source
 - CertInfo struct: fixed protocol version when using OpenSSL
 - TLSOpenSSL: fixed compilation with OpenSSL 1.1.0
 - Registration: added Resource Constraint error condition (thanks to elexis1987) (#267)
+- ConnectionTCP: fixed some blocking (thanks to Marco Ciprietti)
 
 
 

src/connectiontcpclient.cpp

@@ -136,7 +136,11 @@ namespace gloox
       return ConnNoError;
     }
 
+#if defined( _WIN32 ) && !defined( __SYMBIAN32__ )
+    int size = static_cast<int>( ::recv( m_socket, m_buf, m_bufsize ) );
+#else
     int size = static_cast<int>( ::recv( m_socket, m_buf, m_bufsize, 0 ) );
+#endif
     if( size > 0 )
       m_totalBytesIn += size;
 
@@ -146,6 +150,12 @@ namespace gloox
     {
       if( size == -1 )
       {
+
+#if defined(__unix__)
+      if( errno == EAGAIN || errno == EWOULDBLOCK )
+        return ConnNoError;
+#endif
+
         // recv() failed for an unexpected reason
         std::string message = "recv() failed. "
 #if defined( _WIN32 )