recv revert treating zero as hangup

While checking with ab, I found
commit 30cdb3ac8f24a4c289a3b4e8a41d6c5f2e6ec959
Author: Justin Chen <justinchen00@github.invalid.com>
Date:   Thu Apr 14 21:40:53 2016 +0800

    recv treat zero return as error

    https://github.com/warmcat/libwebsockets/issues/475

turned ab performance to crap, reverting it made everything fast again.

recv manpage says there is three ways to get zero returned

1)       When a stream socket peer has performed an orderly shutdown, the return value will be 0  (the  traditional  "end-of-file"
       return).

2)       Datagram  sockets  in  various  domains  (e.g., the UNIX and Internet domains) permit zero-length datagrams.  When such a
       datagram is received, the return value is 0.

3)       The value 0 may also be returned if the requested number of bytes to receive from a stream socket was 0.

we can't just assume it means the peer shut down.

If the peer shut down, then the event loop should get an event on the socket like POLLHUP and deal with it that way.

So the patch mentioned above is simply reverted here.

Signed-off-by: Andy Green <andy@warmcat.com>

diff --git a/lib/output.c b/lib/output.c
index 50ec69eab6e8aef1c5b384e6e683f05159ed7c1e..3dbe8bb17cf18d0fa6eda6f49a6cf89d40ae0a54 100644 (file)
--- a/lib/output.c
+++ b/lib/output.c
@@ -636,7 +636,7 @@ lws_ssl_capable_read_no_ssl(struct lws *wsi, unsigned char *buf, int len)
        int n;
 
        n = recv(wsi->sock, (char *)buf, len, 0);
-       if (n > 0) {
+       if (n >= 0) {
                if (wsi->vhost)
                        wsi->vhost->rx += n;
                return n;
@@ -647,7 +647,7 @@ lws_ssl_capable_read_no_ssl(struct lws *wsi, unsigned char *buf, int len)
            LWS_ERRNO == LWS_EINTR)
                return LWS_SSL_CAPABLE_MORE_SERVICE;
 #endif
-       lwsl_debug("error on reading from skt\n");
+       lwsl_notice("error on reading from skt : %d\n", LWS_ERRNO);
        return LWS_SSL_CAPABLE_ERROR;
 }