1 files changed, 18 insertions, 0 deletions

diff --git a/src/connection.cpp b/src/connection.cpp
index cb3c724..dbf2761 100644
--- a/src/connection.cpp
+++ b/src/connection.cpp
@@ -228,6 +228,24 @@ int Connection::readInput()
                         {
                                 break;
                         }
+
+                        /* New test, if data is divisible by 2048 bytes on some libs the
+                         * read could block, this keeps it from happening.
+                         */
+                        {
+                                fd_set rfds;
+                                FD_ZERO(&rfds);
+                                FD_SET(nSocket, &rfds);
+                                int retval = select( nSocket+1, &rfds, NULL, NULL, NULL );
+                                if( retval == -1 )
+                                        throw ConnectionException(
+                                                excodeBadReadError,
+                                                "Bad Read error"
+                                                );
+                                if( !FD_ISSET( nSocket, &rfds ) )
+                                        break;
+                        }
+
                 }
         }