Fix an issue where Metacube output would not include updated headers (e.g. on encoder...

[cubemap] / httpinput.cpp

diff --git a/httpinput.cpp b/httpinput.cpp
index 5fb55b378610e846f2d74f6074f82f1f95ee58b7..5a93969ff4801c425ca9dc418cc030147e12c808 100644 (file)
--- a/httpinput.cpp
+++ b/httpinput.cpp
@@ -490,7 +490,7 @@ void HTTPInput::process_data(char *ptr, size_t bytes)
 
        if (encoding == Input::INPUT_ENCODING_RAW) {
                for (size_t i = 0; i < stream_indices.size(); ++i) {
-                       servers->add_data(stream_indices[i], ptr, bytes, SUITABLE_FOR_STREAM_START);
+                       servers->add_data(stream_indices[i], ptr, bytes, /*metacube_flags=*/0);
                }
                return;
        }
@@ -568,16 +568,9 @@ void HTTPInput::process_data(char *ptr, size_t bytes)
                        for (size_t i = 0; i < stream_indices.size(); ++i) {
                                servers->set_header(stream_indices[i], http_header, stream_header);
                        }
-               } else {
-                       StreamStartSuitability suitable_for_stream_start;
-                       if (flags & METACUBE_FLAGS_NOT_SUITABLE_FOR_STREAM_START) {
-                               suitable_for_stream_start = NOT_SUITABLE_FOR_STREAM_START;
-                       } else {
-                               suitable_for_stream_start = SUITABLE_FOR_STREAM_START;
-                       }
-                       for (size_t i = 0; i < stream_indices.size(); ++i) {
-                               servers->add_data(stream_indices[i], inner_data, size, suitable_for_stream_start);
-                       }
+               }
+               for (size_t i = 0; i < stream_indices.size(); ++i) {
+                       servers->add_data(stream_indices[i], inner_data, size, flags);
                }
 
                // Consume the block. This isn't the most efficient way of dealing with things