Merge "(bug 32774) Added config options and flags for SSL and compression in DB."

diff --combined includes/DefaultSettings.php
index 807658d,1ccf5a9..d77aed1
--- 1/includes/DefaultSettings.php
--- 2/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@@ -1308,6 -1308,10 +1308,10 @@@ $wgDBuser = 'wikiuser'
  $wgDBpassword = '';
  /** Database type */
  $wgDBtype = 'mysql';
+ /** Whether to use SSL in DB connection. */
+ $wgDBssl = false;
+ /** Whether to use compression in DB connection. */
+ $wgDBcompress = false;
  
  /** Separate username for maintenance tasks. Leave as null to use the default. */
  $wgDBadminuser = null;
@@@ -1393,6 -1397,8 +1397,8 @@@ $wgSharedTables = array( 'user', 'user_
   *                  - DBO_IGNORE -- ignore errors (not useful in LocalSettings.php)
   *                  - DBO_NOBUFFER -- turn off buffering (not useful in LocalSettings.php)
   *                  - DBO_PERSISTENT -- enables persistent database connections
+  *                  - DBO_SSL -- uses SSL/TLS encryption in database connections, if available
+  *                  - DBO_COMPRESS -- uses internal compression in database connections, if available
   *
   *   - max lag:     (optional) Maximum replication lag before a slave will taken out of rotation
   *   - max threads: (optional) Maximum number of running threads
@@@ -2317,16 -2323,16 +2323,16 @@@ $wgVariantArticlePath = false
  $wgLoginLanguageSelector = false;
  
  /**
 - * When translating messages with wfMsg(), it is not always clear what should
 - * be considered UI messages and what should be content messages.
 + * When translating messages with wfMessage(), it is not always clear what 
 + * should be considered UI messages and what should be content messages.
   *
   * For example, for the English Wikipedia, there should be only one 'mainpage',
   * so when getting the link for 'mainpage', we should treat it as site content
 - * and call wfMsgForContent(), but for rendering the text of the link, we call
 - * wfMsg(). The code behaves this way by default. However, sites like the
 - * Wikimedia Commons do offer different versions of 'mainpage' and the like for
 - * different languages. This array provides a way to override the default
 - * behavior.
 + * and call ->inContentLanguage()->text(), but for rendering the text of the
 + * link, we call ->text(). The code behaves this way by default. However,
 + * sites like the Wikimedia Commons do offer different versions of 'mainpage'
 + * and the like for different languages. This array provides a way to override
 + * the default behavior.
   *
   * @par Example:
   * To allow language-specific main page and community