Merge "Add Priority Hints support"

diff --combined includes/DefaultSettings.php
index dc61382,717b7b6..93113df
--- 1/includes/DefaultSettings.php
--- 2/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@@ -940,7 -940,7 +940,7 @@@ $wgFileBlacklist = 
        # HTML may contain cookie-stealing JavaScript and web bugs
        'html', 'htm', 'js', 'jsb', 'mhtml', 'mht', 'xhtml', 'xht',
        # PHP scripts may execute arbitrary code on the server
 -      'php', 'phtml', 'php3', 'php4', 'php5', 'phps',
 +      'php', 'phtml', 'php3', 'php4', 'php5', 'phps', 'phar',
        # Other types that may be interpreted by some servers
        'shtml', 'jhtml', 'pl', 'py', 'cgi',
        # May contain harmful executables for Windows victims
@@@ -1234,7 -1234,7 +1234,7 @@@ $wgAllowTitlesInSVG = false
   *
   * @since 1.33
   */
 -$wgMediaInTargetLanguage = false;
 +$wgMediaInTargetLanguage = true;
  
  /**
   * The maximum number of pixels a source image can have if it is to be scaled
@@@ -4782,24 -4782,6 +4782,24 @@@ $wgPasswordConfig = 
                'cost' => '30000',
                'length' => '64',
        ],
 +      'argon2' => [
 +              'class' => Argon2Password::class,
 +
 +              // Algorithm used:
 +              // * 'argon2i' is optimized against side-channel attacks (PHP 7.2+)
 +              // * 'argon2id' is optimized against both side-channel and GPU cracking (PHP 7.3+)
 +              // * 'auto' to use best available algorithm. If you're using more than one server, be
 +              //   careful when you're mixing PHP versions because newer PHP might generate hashes that
 +              //   older versions might would not understand.
 +              'algo' => 'auto',
 +
 +              // The parameters below are the same as options accepted by password_hash().
 +              // Set them to override that function's defaults.
 +              //
 +              // 'memory_cost' => PASSWORD_ARGON2_DEFAULT_MEMORY_COST,
 +              // 'time_cost' => PASSWORD_ARGON2_DEFAULT_TIME_COST,
 +              // 'threads' => PASSWORD_ARGON2_DEFAULT_THREADS,
 +      ],
  ];
  
  /**
@@@ -9045,6 -9027,16 +9045,16 @@@ $wgEnableBlockNoticeStats = false
   */
  $wgOriginTrials = [];
  
+ /**
+  * Enable client-side Priority Hints.
+  *
+  * @warning EXPERIMENTAL!
+  *
+  * @since 1.34
+  * @var bool
+  */
+ $wgPriorityHints = false;
+ 
  /**
   * For really cool vim folding this needs to be at the end:
   * vim: foldmarker=@{,@} foldmethod=marker