| Index: trunk/phase3/includes/DefaultSettings.php |
| — | — | @@ -793,6 +793,7 @@ |
| 794 | 794 | $wgMemCachedDebug = false; ///< Will be set to false in Setup.php, if the server isn't working |
| 795 | 795 | $wgMemCachedServers = array( '127.0.0.1:11000' ); |
| 796 | 796 | $wgMemCachedPersistent = false; |
| | 797 | +$wgMemCachedTimeout = 100000; //Server connection timeout in microseconds |
| 797 | 798 | /**@}*/ |
| 798 | 799 | |
| 799 | 800 | /** |
| Index: trunk/phase3/includes/memcached-client.php |
| — | — | @@ -244,6 +244,7 @@ |
| 245 | 245 | * @return mixed |
| 246 | 246 | */ |
| 247 | 247 | public function __construct( $args ) { |
| | 248 | + global $wgMemCachedTimeout; |
| 248 | 249 | $this->set_servers( @$args['servers'] ); |
| 249 | 250 | $this->_debug = @$args['debug']; |
| 250 | 251 | $this->stats = array(); |
| — | — | @@ -256,7 +257,7 @@ |
| 257 | 258 | $this->_host_dead = array(); |
| 258 | 259 | |
| 259 | 260 | $this->_timeout_seconds = 0; |
| 260 | | - $this->_timeout_microseconds = 50000; |
| | 261 | + $this->_timeout_microseconds = $wgMemCachedTimeout; |
| 261 | 262 | |
| 262 | 263 | $this->_connect_timeout = 0.01; |
| 263 | 264 | $this->_connect_attempts = 2; |
| Index: trunk/phase3/RELEASE-NOTES |
| — | — | @@ -94,8 +94,9 @@ |
| 95 | 95 | * Added $wgAdvertisedFeedTypes to decide what feed types (RSS, Atom, both, or |
| 96 | 96 | neither) MediaWiki advertises. Default is array( 'atom' ), so RSS is no |
| 97 | 97 | longer advertised by default (but it still works). |
| | 98 | +* Added $wgMemCachedTimeout to configure connection timeouts for communicating |
| | 99 | + with a memcached server |
| 98 | 100 | |
| 99 | | - |
| 100 | 101 | === New features in 1.16 === |
| 101 | 102 | |
| 102 | 103 | * Add CSS defintion of the 'wikitable' class to shared.css |