From: skodak <skodak>
Date: Wed, 4 Apr 2007 19:45:17 +0000 (+0000)
Subject: MDL-8802 fixed byteserving broken by adobe anti xss patch; merged from MOODLE_18_STABLE
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=c57d88740fbb2eaf0f75037c963ffa0d2a54ff77;p=moodle.git

MDL-8802 fixed byteserving broken by adobe anti xss patch; merged from MOODLE_18_STABLE
---

diff --git a/lib/filelib.php b/lib/filelib.php
index 5511bdf626..051ffa80bc 100644
--- a/lib/filelib.php
+++ b/lib/filelib.php
@@ -264,7 +264,10 @@ function send_file($path, $filename, $lifetime=86400 , $filter=0, $pathisstring=
     if ($mimetype=='application/pdf' or mimeinfo('type', $filename)=='application/pdf') {
         //please note that it prevents opening of pdfs in browser when http referer disabled
         //or file linked from another site; browser caching of pdfs is now disabled too
-        if (empty($_SERVER['HTTP_REFERER']) or strpos($_SERVER['HTTP_REFERER'], $CFG->wwwroot)!==0) {
+        if (!empty($_SERVER['HTTP_RANGE'])) {
+            //already byteserving
+            $lifetime = 1; // >0 needed for byteserving    
+        } else if (empty($_SERVER['HTTP_REFERER']) or strpos($_SERVER['HTTP_REFERER'], $CFG->wwwroot)!==0) {
             $mimetype = 'application/x-forcedownload';
             $forcedownload = true;
             $lifetime = 0;