Make the SENDING_HEADER state fall through.

In the case where we really are in WAITING_KEYFRAME, we will go to
sleep immediately in the state below, but there's also a case
where we could end up directly in SENDING_DATA and don't want to
wait for the stream to get more data to start sending.

diff --git a/server.cpp b/server.cpp
index d81181806f101c340fae84a5da8f02e20f6f9190..14162f58e5a960cc37e35cb18796e270c883714e 100644 (file)
--- a/server.cpp
+++ b/server.cpp
@@ -479,12 +479,12 @@ sending_header_or_error_again:
                            stream->bytes_received - stream->backlog_size,
                            0);
                        client->state = Client::SENDING_DATA;
                            stream->bytes_received - stream->backlog_size,
                            0);
                        client->state = Client::SENDING_DATA;

+                       goto sending_data;

                } else {
                        client->stream_pos = stream->bytes_received;
                        client->state = Client::WAITING_FOR_KEYFRAME;
                }
                } else {
                        client->stream_pos = stream->bytes_received;
                        client->state = Client::WAITING_FOR_KEYFRAME;
                }

-               stream->put_client_to_sleep(client);
-               return;
+               // Fall through.

        }
        case Client::WAITING_FOR_KEYFRAME: {
                Stream *stream = client->stream;
        }
        case Client::WAITING_FOR_KEYFRAME: {
                Stream *stream = client->stream;


@@ -514,6 +514,7 @@ sending_header_or_error_again:
                // Fall through.
        }
        case Client::SENDING_DATA: {
                // Fall through.
        }
        case Client::SENDING_DATA: {

+sending_data:

                skip_lost_data(client);
                Stream *stream = client->stream;
 
                skip_lost_data(client);
                Stream *stream = client->stream;