From: Steinar H. Gunderson <sgunderson@bigfoot.com>
Date: Sun, 8 Jul 2018 17:44:07 +0000 (+0200)
Subject: Fix that HTTP keepalive information would get lost across exec(), which could lead... 
X-Git-Tag: 1.4.0~5
X-Git-Url: https://git.sesse.net/?p=cubemap;a=commitdiff_plain;h=2b9ff2cf5d26abde03f8f2ebea0a423145d0c2d7;hp=4935d50a97f7391795b7974b40c85003189f117a

Fix that HTTP keepalive information would get lost across exec(), which could lead on crashes when a client had to skip data.
---

diff --git a/client.cpp b/client.cpp
index d7bec09..2552c69 100644
--- a/client.cpp
+++ b/client.cpp
@@ -59,6 +59,8 @@ Client::Client(const ClientProto &serialized, const vector<shared_ptr<const stri
 	  request(serialized.request()),
 	  url(serialized.url()),
 	  stream(stream),
+	  close_after_response(serialized.close_after_response()),
+	  http_11(serialized.http_11()),
 	  header_or_short_response_bytes_sent(serialized.header_or_short_response_bytes_sent()),
 	  stream_pos(serialized.stream_pos()),
 	  stream_pos_end(serialized.stream_pos_end()),
@@ -138,6 +140,8 @@ ClientProto Client::serialize(unordered_map<const string *, size_t> *short_respo
 	serialized.set_bytes_sent(bytes_sent);
 	serialized.set_bytes_lost(bytes_lost);
 	serialized.set_num_loss_events(num_loss_events);
+	serialized.set_http_11(http_11);
+	serialized.set_close_after_response(close_after_response);
 
 	if (tls_context != nullptr) {
 		bool small_version = false;
diff --git a/state.proto b/state.proto
index 90d86e4..290c0ff 100644
--- a/state.proto
+++ b/state.proto
@@ -23,6 +23,8 @@ message ClientProto {
 	optional int64 tls_output_bytes_already_consumed = 18;
 	optional bool in_ktls_mode = 19;
 	optional bytes x_playback_session_id = 22;
+	optional bool close_after_response = 23;
+	optional bool http_11 = 24;
 };
 
 // Corresponds to struct Stream::FragmentStart.