Merge pull request #720 from hintjens/master

test_stream failed when response was broken into frames

configure.ac

@@ -102,8 +102,17 @@ if test "x$zmq_search_libsodium_lib" = "xyes"; then
     fi
 fi
 
-# Set pedantic
-libzmq_pedantic="yes"
+AC_ARG_WITH([relaxed],
+            [AS_HELP_STRING([--with-relaxed],
+                            [Switch off pedantic compiler])],
+            [zmq_relaxed="yes"],
+            [])
+
+if test "x$zmq_relaxed" = "xyes"; then
+    libzmq_pedantic="no"
+else
+    libzmq_pedantic="yes"
+fi
 
 # By default compiling with -Werror except OSX.
 libzmq_werror="yes"

tests/test_stream.cpp

@@ -89,15 +89,14 @@ test_stream_to_dealer (void)
     assert (rc == sizeof (greeting));
 
     //  Now we expect the data from the DEALER socket
-    //  First frame is, again, the identity of the connection
+    //  We want the rest of greeting along with the Ready command
+    int bytes_read = 0;
+    while (bytes_read < 97) {
+        //  First frame is the identity of the connection (each time)
         rc = zmq_msg_recv (&identity, stream, 0);
         assert (rc > 0);
         assert (zmq_msg_more (&identity));
-
-    //  Second frame contains the rest of greeting along with
-    //  the Ready command
-    int bytes_read = 0;
-    while (bytes_read < 97) {
+        //  Second frame contains the next chunk of data
         rc = zmq_recv (stream, buffer + bytes_read, 255 - bytes_read, 0);
         assert (rc >= 0);
         bytes_read += rc;