X-Git-Url: https://git.sesse.net/?p=cubemap;a=blobdiff_plain;f=client.cpp;h=77fad722a6ba9881ad44cc1e3c949beba1a580e9;hp=786e17825817e9bfa9360042a099c411646254c7;hb=38a2bb28fd8dcb5bb1e0cb56028936a35f20f503;hpb=207ca0494024641f27537ad3cf047814d8092678

diff --git a/client.cpp b/client.cpp
index 786e178..77fad72 100644
--- a/client.cpp
+++ b/client.cpp
@@ -19,7 +19,7 @@ Client::Client(int sock)
 	: sock(sock),
 	  state(Client::READING_REQUEST),
 	  stream(NULL),
-	  header_or_error_bytes_sent(0),
+	  header_or_short_response_bytes_sent(0),
 	  stream_pos(0),
 	  bytes_sent(0),
 	  bytes_lost(0),
@@ -70,8 +70,8 @@ Client::Client(const ClientProto &serialized, Stream *stream)
 	  request(serialized.request()),
 	  url(serialized.url()),
 	  stream(stream),
-	  header_or_error(serialized.header_or_error()),
-	  header_or_error_bytes_sent(serialized.header_or_error_bytes_sent()),
+	  header_or_short_response(serialized.header_or_short_response()),
+	  header_or_short_response_bytes_sent(serialized.header_or_short_response_bytes_sent()),
 	  stream_pos(serialized.stream_pos()),
 	  bytes_sent(serialized.bytes_sent()),
 	  bytes_lost(serialized.bytes_lost()),
@@ -100,8 +100,8 @@ ClientProto Client::serialize() const
 	serialized.set_state(state);
 	serialized.set_request(request);
 	serialized.set_url(url);
-	serialized.set_header_or_error(header_or_error);
-	serialized.set_header_or_error_bytes_sent(serialized.header_or_error_bytes_sent());
+	serialized.set_header_or_short_response(header_or_short_response);
+	serialized.set_header_or_short_response_bytes_sent(serialized.header_or_short_response_bytes_sent());
 	serialized.set_stream_pos(stream_pos);
 	serialized.set_bytes_sent(bytes_sent);
 	serialized.set_bytes_lost(bytes_lost);