Merge remote-tracking branch 'remotes/origin/master' into revisions_local

1 files changed, 9 insertions, 7 deletions

diff --git a/inc/httputils.php b/inc/httputils.php
index ca60ed509..efeb2a56c 100644
--- a/inc/httputils.php
+++ b/inc/httputils.php
@@ -64,12 +64,13 @@ function http_conditionalRequest($timestamp){
  * Let the webserver send the given file via x-sendfile method
  *
  * @author Chris Smith <chris@jalakai.co.uk>
- * @returns  void or exits with previously header() commands executed
+ * @param string $file absolute path of file to send
+ * @returns  void or exits with previous header() commands executed
  */
 function http_sendfile($file) {
     global $conf;
 
-    //use x-sendfile header to pass the delivery to compatible webservers
+    //use x-sendfile header to pass the delivery to compatible web servers
     if($conf['xsendfile'] == 1){
         header("X-LIGHTTPD-send-file: $file");
         ob_end_clean();
@@ -79,12 +80,12 @@ function http_sendfile($file) {
         ob_end_clean();
         exit;
     }elseif($conf['xsendfile'] == 3){
+        // FS#2388 nginx just needs the relative path.
+        $file = DOKU_REL.substr($file, strlen(fullpath(DOKU_INC)) + 1);
         header("X-Accel-Redirect: $file");
         ob_end_clean();
         exit;
     }
-
-    return false;
 }
 
 /**
@@ -92,7 +93,7 @@ function http_sendfile($file) {
  *
  * This function exits the running script
  *
- * @param ressource $fh - file handle for an already open file
+ * @param resource $fh - file handle for an already open file
  * @param int $size     - size of the whole file
  * @param int $mime     - MIME type of the file
  *
@@ -204,7 +205,7 @@ function http_gzip_valid($uncompressed_file) {
  *
  * This function handles output of cacheable resource files. It ses the needed
  * HTTP headers. If a useable cache is present, it is passed to the web server
- * and the scrpt is terminated.
+ * and the script is terminated.
  */
 function http_cached($cache, $cache_ok) {
     global $conf;
@@ -223,7 +224,8 @@ function http_cached($cache, $cache_ok) {
             header('Content-Encoding: gzip');
             readfile($cache.".gz");
         } else {
-            if (!http_sendfile($cache)) readfile($cache);
+            http_sendfile($cache);
+            readfile($cache);
         }
         exit;
     }