Merge pull request #4872 from FreddieV96/master

Added fix to recvAll that doesn't use signal (Left 0)
idris-lang · Jun 6, 2020 · bf5431b · bf5431b
2 parents 8ea1ec1 + 3d9e8b6
commit bf5431b
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/libs/contrib/Network/Socket.idr b/libs/contrib/Network/Socket.idr
@@ -178,10 +178,10 @@ recvAll sock = recvRec sock [] 64
     recvRec : Socket -> List String -> ByteLength -> IO (Either SocketError String)
     recvRec sock acc n = do res <- recv sock n
                             case res of
-                              Left 0 => pure (Right $ concat $ reverse acc)
                               Left c => pure (Left c)
-                              Right (str, _) => let n' = min (n * 2) 65536 in
-                                                recvRec sock (str :: acc) n'
+                              Right (str, res) => let n' = min (n * 2) 65536 in
+                                                  if res < n then pure (Right $ concat $ reverse $ str :: acc)
+                                                  else recvRec sock (str :: acc) n'
 
 ||| Send a message.
 |||