[rygel/rygel-0-28] server: Fix Range header of resources without length
- From: Jens Georg <jensgeorg src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [rygel/rygel-0-28] server: Fix Range header of resources without length
- Date: Sun, 7 Feb 2016 16:41:49 +0000 (UTC)
commit a4d1d43c9d3d67a95d08dd8b383e44dd01f56832
Author: Jens Georg <mail jensge org>
Date: Sat Feb 6 19:40:20 2016 +0100
server: Fix Range header of resources without length
Signed-off-by: Jens Georg <mail jensge org>
src/librygel-server/rygel-data-sink.vala | 5 +++++
.../rygel-http-byte-seek-request.vala | 3 ++-
2 files changed, 7 insertions(+), 1 deletions(-)
---
diff --git a/src/librygel-server/rygel-data-sink.vala b/src/librygel-server/rygel-data-sink.vala
index 02de116..6ff7dbc 100644
--- a/src/librygel-server/rygel-data-sink.vala
+++ b/src/librygel-server/rygel-data-sink.vala
@@ -92,6 +92,11 @@ internal class Rygel.DataSink : Object {
}
var request = offsets as HTTPByteSeekRequest;
+ if (request.range_length == -1) {
+ debug ("Setting max_bytes to MAX");
+
+ return int64.MAX;
+ }
debug ("Setting max_bytes to %lld", request.range_length);
return request.range_length;
diff --git a/src/librygel-server/rygel-http-byte-seek-request.vala
b/src/librygel-server/rygel-http-byte-seek-request.vala
index 872d094..84423a9 100644
--- a/src/librygel-server/rygel-http-byte-seek-request.vala
+++ b/src/librygel-server/rygel-http-byte-seek-request.vala
@@ -99,10 +99,11 @@ public class Rygel.HTTPByteSeekRequest : Rygel.HTTPSeekRequest {
}
if (range_tokens[1] == null || (range_tokens[1].length == 0)) {
- end_byte = total_size - 1;
if (total_size != UNSPECIFIED) {
+ end_byte = total_size - 1;
range_length = end_byte - start_byte + 1; // range is inclusive
} else {
+ end_byte = UNSPECIFIED;
range_length = UNSPECIFIED;
}
} else {
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]