Merge branch 'bug_content_length' into 'next-release'

Store filesize before encrypting the file

See merge request jirafeau/Jirafeau!11

diff --git a/lib/functions.php b/lib/functions.php
index 2843e29d685f34fd0963ac7fe2d4fc203a77e163..9091af7d3b27772de8d0df99d197b34a01cbfb9d 100644 (file)
--- a/lib/functions.php
+++ b/lib/functions.php
@@ -1197,6 +1197,11 @@ function jirafeau_async_end($ref, $code, $crypt, $link_name_length, $file_hash_m
         return "Error: referenced file does not exist";
     }
 
+    /* Store filesize before encrypting the file */
+    /* Otherwise we would send the size of the encrypted file and the data of the unencrypted file */
+    /* This would break some browsers */
+    $size = filesize($p);
+
     $crypted = false;
     $crypt_key = '';
     if ($crypt == true && extension_loaded('sodium') == true) {
@@ -1209,7 +1214,6 @@ function jirafeau_async_end($ref, $code, $crypt, $link_name_length, $file_hash_m
     }
 
     $hash = jirafeau_hash_file($file_hash_method, $p);
-    $size = filesize($p);
     $np = s2p($hash);
     $delete_link_code = jirafeau_gen_random(5);