ZoneMinder
/
zoneminder
mirror of https://github.com/ZoneMinder/zoneminder.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix sending full content when we should be

pull/1857/head
Isaac Connor 2016-11-03 11:23:10 -04:00
parent 0ea8461192
commit a87f5e1592
1 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
web/views/view_video.php
View File

@ -58,7 +58,8 @@ if ( ! $fh ) {
} }
$begin = 0; $begin = 0;
$end = $size; $end = $size-1;
$length = $size;
if ( isset( $_SERVER['HTTP_RANGE'] ) ) { if ( isset( $_SERVER['HTTP_RANGE'] ) ) {
Debug("Using Range " . $_SERVER['HTTP_RANGE'] ); Debug("Using Range " . $_SERVER['HTTP_RANGE'] );
@ -67,23 +68,24 @@ if ( isset( $_SERVER['HTTP_RANGE'] ) ) {
if ( ! empty( $matches[2]) ) { if ( ! empty( $matches[2]) ) {
$end = intval( $matches[2] ); $end = intval( $matches[2] );
} }
Debug("Using Range $begin $end size: $size"); $length = $end - $begin + 1;
Debug("Using Range $begin $end size: $size, length: $length");
} }
} # end if HTTP_RANGE } # end if HTTP_RANGE
if ( $begin > 0 || $end < $size ) { header('Content-type: video/mp4');
header('Accept-Ranges: bytes');
header('Content-Length: '.$length);
header("Content-Disposition: inline;");
if ( $begin > 0 || $end < $size-1 ) {
header('HTTP/1.0 206 Partial Content'); header('HTTP/1.0 206 Partial Content');
header("Content-Range: bytes $begin-$end/$size");
header("Content-Transfer-Encoding: binary\n");
header('Connection: close');
} else { } else {
header('HTTP/1.0 200 OK'); header('HTTP/1.0 200 OK');
} }
header('Content-type: video/mp4');
header('Accept-Ranges: bytes');
header('Content-Length:'.($end-$begin));
header("Content-Disposition: inline;");
header("Content-Range: bytes $begin-$end/$size");
header("Content-Transfer-Encoding: binary\n");
header('Connection: close');
// Apparently without these we get a few extra bytes of output at the end... // Apparently without these we get a few extra bytes of output at the end...
ob_clean(); ob_clean();
@ -98,3 +100,6 @@ while( ! feof( $fh ) && $cur < $end && ( connection_status() == 0 ) ) {
$cur += 1024*16; $cur += 1024*16;
usleep(100); usleep(100);
} }
fclose();
exit();