Merge "When file sha1 populator fixes wrong values, make it fix the other metadata."

[lhc/web/wiklou.git] / includes / StreamFile.php

diff --git a/includes/StreamFile.php b/includes/StreamFile.php
index ce13a21..6539e08 100644 (file)
--- a/includes/StreamFile.php
+++ b/includes/StreamFile.php
@@ -1,9 +1,28 @@
 <?php
 /**
- * Functions related to the output of file content
+ * Functions related to the output of file content.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * http://www.gnu.org/copyleft/gpl.html
  *
  * @file
  */
+
+/**
+ * Functions related to the output of file content
+ */
 class StreamFile {
        const READY_STREAM = 1;
        const NOT_MODIFIED = 2;
@@ -19,18 +38,25 @@ class StreamFile {
         * @return bool Success
         */
        public static function stream( $fname, $headers = array(), $sendErrors = true ) {
+               wfProfileIn( __METHOD__ );
+
                wfSuppressWarnings();
                $stat = stat( $fname );
                wfRestoreWarnings();
 
                $res = self::prepareForStream( $fname, $stat, $headers, $sendErrors );
                if ( $res == self::NOT_MODIFIED ) {
-                       return true; // use client cache
+                       $ok = true; // use client cache
                } elseif ( $res == self::READY_STREAM ) {
-                       return readfile( $fname );
+                       wfProfileIn( __METHOD__ . '-send' );
+                       $ok = readfile( $fname );
+                       wfProfileOut( __METHOD__ . '-send' );
                } else {
-                       return false; // failed
+                       $ok = false; // failed
                }
+
+               wfProfileOut( __METHOD__ );
+               return $ok;
        }
 
        /**