Merge "Remove a CURLOPT_CONNECTTIMEOUT_MS check"

[lhc/web/wiklou.git] / includes / utils / ZipDirectoryReader.php

diff --git a/includes/utils/ZipDirectoryReader.php b/includes/utils/ZipDirectoryReader.php
index 20bad13..46f1aaa 100644 (file)
--- a/includes/utils/ZipDirectoryReader.php
+++ b/includes/utils/ZipDirectoryReader.php
@@ -127,7 +127,6 @@ class ZipDirectoryReader {
        const GENERAL_CD_ENCRYPTED = 13;
 
        /**
-        * Private constructor
         * @param string $fileName
         * @param callable $callback
         * @param array $options
@@ -511,7 +510,7 @@ class ZipDirectoryReader {
         * in the file to satisfy the request, an exception will be thrown.
         *
         * @param int $start The byte offset of the start of the block.
-        * @param int $length The number of bytes to return. If omitted, the remainder
+        * @param int|null $length The number of bytes to return. If omitted, the remainder
         *    of the file will be returned.
         *
         * @return string