Fix an issue where clients would be put twice into sleeping_clients (probably since...

diff --git a/server.cpp b/server.cpp
index 54e6b5e804d9959632b1ef70df6a53fee7f52fac..94350faae3ff182d93e232ea6d34bffc50f54080 100644 (file)
--- a/server.cpp
+++ b/server.cpp
@@ -404,7 +404,7 @@ sending_header_or_error_again:
                // This is postcondition #3.
                client->state = Client::SENDING_DATA;
                client->bytes_sent = client->stream->data_size;
                // This is postcondition #3.
                client->state = Client::SENDING_DATA;
                client->bytes_sent = client->stream->data_size;

-               sleeping_clients.push_back(client);
+               put_client_to_sleep(client);

                return;
        }
        case Client::SENDING_DATA: {
                return;
        }
        case Client::SENDING_DATA: {


@@ -412,6 +412,9 @@ sending_header_or_error_again:
                // but resync will be the mux's problem.
                const Stream *stream = client->stream;
                size_t bytes_to_send = stream->data_size - client->bytes_sent;
                // but resync will be the mux's problem.
                const Stream *stream = client->stream;
                size_t bytes_to_send = stream->data_size - client->bytes_sent;

+               if (bytes_to_send == 0) {
+                       return;
+               }

                if (bytes_to_send > BACKLOG_SIZE) {
                        fprintf(stderr, "WARNING: fd %d lost %lld bytes, maybe too slow connection\n",
                                client->sock,
                if (bytes_to_send > BACKLOG_SIZE) {
                        fprintf(stderr, "WARNING: fd %d lost %lld bytes, maybe too slow connection\n",
                                client->sock,