Store the stream header in the inputs, not just the streams.

This avoids an issue where a stream would get no stream header
when it reused an existing input.

diff --git a/httpinput.cpp b/httpinput.cpp
index 2fe68061b44c89e7b8a2811df8c5aff3369cb3bd..2e6e617bad9905c78e1b3b7427cd53f2e5a6bb3f 100644 (file)
--- a/httpinput.cpp
+++ b/httpinput.cpp
@@ -49,6 +49,7 @@ HTTPInput::HTTPInput(const InputProto &serialized)
          request_bytes_sent(serialized.request_bytes_sent()),
          response(serialized.response()),
          http_header(serialized.http_header()),
          request_bytes_sent(serialized.request_bytes_sent()),
          response(serialized.response()),
          http_header(serialized.http_header()),

+         stream_header(serialized.stream_header()),

          has_metacube_header(serialized.has_metacube_header()),
          sock(serialized.sock())
 {
          has_metacube_header(serialized.has_metacube_header()),
          sock(serialized.sock())
 {


@@ -95,6 +96,7 @@ InputProto HTTPInput::serialize() const
        serialized.set_request_bytes_sent(request_bytes_sent);
        serialized.set_response(response);
        serialized.set_http_header(http_header);
        serialized.set_request_bytes_sent(request_bytes_sent);
        serialized.set_response(response);
        serialized.set_http_header(http_header);

+       serialized.set_stream_header(stream_header);

        serialized.set_pending_data(string(pending_data.begin(), pending_data.end()));
        serialized.set_has_metacube_header(has_metacube_header);
        serialized.set_sock(sock);
        serialized.set_pending_data(string(pending_data.begin(), pending_data.end()));
        serialized.set_has_metacube_header(has_metacube_header);
        serialized.set_sock(sock);


@@ -263,7 +265,7 @@ bool HTTPInput::parse_response(const std::string &request)
        }
 
        for (size_t i = 0; i < stream_indices.size(); ++i) {
        }
 
        for (size_t i = 0; i < stream_indices.size(); ++i) {

-               servers->set_header(stream_indices[i], http_header, "");
+               servers->set_header(stream_indices[i], http_header, stream_header);

        }
 
        return true;
        }
 
        return true;


@@ -504,9 +506,9 @@ void HTTPInput::process_data(char *ptr, size_t bytes)
                }
                char *inner_data = pending_data.data() + sizeof(metacube_block_header);
                if (flags & METACUBE_FLAGS_HEADER) {
                }
                char *inner_data = pending_data.data() + sizeof(metacube_block_header);
                if (flags & METACUBE_FLAGS_HEADER) {

-                       string header(inner_data, inner_data + size);
+                       stream_header = string(inner_data, inner_data + size);

                        for (size_t i = 0; i < stream_indices.size(); ++i) {
                        for (size_t i = 0; i < stream_indices.size(); ++i) {

-                               servers->set_header(stream_indices[i], http_header, header);
+                               servers->set_header(stream_indices[i], http_header, stream_header);

                        }
                } else {
                        StreamStartSuitability suitable_for_stream_start;
                        }
                } else {
                        StreamStartSuitability suitable_for_stream_start;


@@ -542,7 +544,7 @@ void HTTPInput::drop_pending_data(size_t num_bytes)
 void HTTPInput::add_destination(int stream_index)
 {
        stream_indices.push_back(stream_index);
 void HTTPInput::add_destination(int stream_index)
 {
        stream_indices.push_back(stream_index);

-       servers->set_header(stream_index, http_header, "");
+       servers->set_header(stream_index, http_header, stream_header);

 }
 
 InputStats HTTPInput::get_stats() const
 }
 
 InputStats HTTPInput::get_stats() const

diff --git a/httpinput.h b/httpinput.h
index 78c49c3df0f0cde346487698d2afdcf1b925bb5e..2273e7dd2782535684fa92be5c4b5ad86140d52a 100644 (file)
--- a/httpinput.h
+++ b/httpinput.h
@@ -69,9 +69,12 @@ private:
        // The HTTP response we've received so far. Only relevant for RECEIVING_HEADER.
        std::string response;
 
        // The HTTP response we've received so far. Only relevant for RECEIVING_HEADER.
        std::string response;
 

-       // The HTTP respones headers we want to give clients for this input.
+       // The HTTP response headers we want to give clients for this input.

        std::string http_header;
 
        std::string http_header;
 

+       // The stream heder we want to give clients for this input.
+       std::string stream_header;
+

        // Data we have received but not fully processed yet.
        std::vector<char> pending_data;
 
        // Data we have received but not fully processed yet.
        std::vector<char> pending_data;
 

diff --git a/main.cpp b/main.cpp
index 3f36f32da35ab493c5ba987dccf18b751dc6b92d..c4c5bd4187d3a74850a721fb2d8b90f77835405d 100644 (file)
--- a/main.cpp
+++ b/main.cpp
@@ -401,6 +401,7 @@ start:
                serialize_start.tv_usec = loaded_state.serialize_start_usec();
 
                // Deserialize the streams.
                serialize_start.tv_usec = loaded_state.serialize_start_usec();
 
                // Deserialize the streams.

+               map<string, string> stream_headers_for_url;  // See below.

                for (int i = 0; i < loaded_state.streams_size(); ++i) {
                        const StreamProto &stream = loaded_state.streams(i);
 
                for (int i = 0; i < loaded_state.streams_size(); ++i) {
                        const StreamProto &stream = loaded_state.streams(i);
 


@@ -423,15 +424,28 @@ start:
 
                                servers->add_stream_from_serialized(stream, data_fds);
                                deserialized_urls.insert(stream.url());
 
                                servers->add_stream_from_serialized(stream, data_fds);
                                deserialized_urls.insert(stream.url());

+
+                               stream_headers_for_url.insert(make_pair(stream.url(), stream.stream_header()));

                        }
                }
 
                // Deserialize the inputs. Note that we don't actually add them to any stream yet.
                for (int i = 0; i < loaded_state.inputs_size(); ++i) {
                        }
                }
 
                // Deserialize the inputs. Note that we don't actually add them to any stream yet.
                for (int i = 0; i < loaded_state.inputs_size(); ++i) {

+                       InputProto serialized_input = loaded_state.inputs(i);
+
+                       // Older versions did not store the stream header in the input,
+                       // only in each stream. We need to have the stream header in the
+                       // input as well, in case we create a new stream reusing the same input.
+                       // Thus, we put it into place here if it's missing.
+                       if (!serialized_input.has_stream_header() &&
+                           stream_headers_for_url.count(serialized_input.url()) != 0) {
+                               serialized_input.set_stream_header(stream_headers_for_url[serialized_input.url()]);
+                       }
+

                        InputWithRefcount iwr;
                        InputWithRefcount iwr;

-                       iwr.input = create_input(loaded_state.inputs(i));
+                       iwr.input = create_input(serialized_input);

                        iwr.refcount = 0;
                        iwr.refcount = 0;

-                       inputs.insert(make_pair(loaded_state.inputs(i).url(), iwr));
+                       inputs.insert(make_pair(serialized_input.url(), iwr));

                } 
 
                // Deserialize the acceptors.
                } 
 
                // Deserialize the acceptors.

diff --git a/state.proto b/state.proto
index 99c1e92e657eaf15906f28b5dfa194b0e6ae17f0..9479c2ad5b87bc6e34836040534fe69e5afbfdb2 100644 (file)
--- a/state.proto
+++ b/state.proto
@@ -40,6 +40,7 @@ message InputProto {
        optional int32 request_bytes_sent = 5;
        optional bytes response = 6;
        optional bytes http_header = 10;
        optional int32 request_bytes_sent = 5;
        optional bytes response = 6;
        optional bytes http_header = 10;

+       optional bytes stream_header = 14;

        optional bytes pending_data = 7;
        optional bool has_metacube_header = 8;
        optional int32 sock = 9;
        optional bytes pending_data = 7;
        optional bool has_metacube_header = 8;
        optional int32 sock = 9;