Merge "Use ForeignFileRepo information for foreign uploads"

diff --combined RELEASE-NOTES-1.27
index 2310cdb,548baea..dd2bf1c
--- 1/RELEASE-NOTES-1.27
--- 2/RELEASE-NOTES-1.27
+++ b/RELEASE-NOTES-1.27
@@@ -16,22 -16,12 +16,23 @@@ production
    1000 for the latter) are now hard-coded.
  * $wgDebugDumpSqlLength was removed (deprecated in 1.24).
  * $wgDebugDBTransactions was removed (deprecated in 1.20).
+ * $wgRemoteUploadTarget (added in 1.26) removed, replaced by $wgForeignUploadTargets
  
  === New features in 1.27 ===
  * $wgDataCenterId and $wgDataCenterRoles where added, which will serve as
    basic configuration settings needed for multi-datacenter setups.
    $wgDataCenterUpdateStickTTL was also added.
 +* Added a new hook, 'UserMailerTransformContent', to transform the contents
 +  of an email. This is similar to the EmailUser hook but applies to all mail
 +  sent via UserMailer.
 +* Added a new hook, 'UserMailerTransformMessage', to transform the contents
 +  of an emai after MIME encoding.
 +* Added a new hook, 'UserMailerSplitTo', to control which users have to be
 +  emailed separately (ie. there is a single address in the To: field) so
 +  user-specific changes to the email can be applied safely.
 +* $wgCdnMaxageLagged was added, which limits the CDN cache TTL
 +  when any load balancer uses a DB that is lagged beyond the 'max lag'
 +  setting in the relevant section of $wgLBFactoryConf.
  
  ==== External libraries ====
  

diff --combined includes/DefaultSettings.php
index 3153afb,f0fd83a..95baa56
--- 1/includes/DefaultSettings.php
--- 2/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@@ -526,12 -526,11 +526,11 @@@ $wgForeignFileRepos = array()
  $wgUseInstantCommons = false;
  
  /**
-  * Name of the remote repository to which users will be allowed to upload
-  * files in their editors. Used to find a set of message names to describe
-  * the legal requirements for uploading to that wiki, and suggestions for
-  * when those requirements are not met.
+  * Array of foreign file repos (set in $wgForeignFileRepos above) that
+  * are allowable upload targets. These wikis must have some method of
+  * authentication (i.e. CentralAuth), and be CORS-enabled for this wiki.
   */
- $wgRemoteUploadTarget = 'default';
+ $wgForeignUploadTargets = array();
  
  /**
   * File backend structure configuration.
@@@ -2567,21 -2566,14 +2566,21 @@@ $wgVaryOnXFP = false
  $wgInternalServer = false;
  
  /**
 - * Cache timeout for the squid, will be sent as s-maxage (without ESI) or
 - * Surrogate-Control (with ESI). Without ESI, you should strip out s-maxage in
 - * the Squid config.
 + * Cache TTL for the CDN sent as s-maxage (without ESI) or
 + * Surrogate-Control (with ESI). Without ESI, you should strip
 + * out s-maxage in the Squid config.
   *
 -* 18000 seconds = 5 hours, more cache hits with 2678400 = 31 days.
 + * 18000 seconds = 5 hours, more cache hits with 2678400 = 31 days.
   */
  $wgSquidMaxage = 18000;
  
 +/**
 + * Cache timeout for the CDN when DB slave lag is high
 + * @see $wgSquidMaxage
 + * @since 1.27
 + */
 +$wgCdnMaxageLagged = 30;
 +
  /**
   * Default maximum age for raw CSS/JS accesses
   *