Merge "Add extra views (tabs) for files in a foreign repository"

[lhc/web/wiklou.git] / includes / objectcache / MemcachedClient.php

diff --git a/includes/objectcache/MemcachedClient.php b/includes/objectcache/MemcachedClient.php
index d9ea54c..d39b288 100644 (file)
--- a/includes/objectcache/MemcachedClient.php
+++ b/includes/objectcache/MemcachedClient.php
@@ -102,8 +102,8 @@ class MWMemcached {
        /**
         * Command statistics
         *
-        * @var     array
-        * @access  public
+        * @var array
+        * @access public
         */
        var $stats;
 
@@ -113,112 +113,112 @@ class MWMemcached {
        /**
         * Cached Sockets that are connected
         *
-        * @var     array
-        * @access  private
+        * @var array
+        * @access private
         */
        var $_cache_sock;
 
        /**
         * Current debug status; 0 - none to 9 - profiling
         *
-        * @var     boolean
-        * @access  private
+        * @var boolean
+        * @access private
         */
        var $_debug;
 
        /**
         * Dead hosts, assoc array, 'host'=>'unixtime when ok to check again'
         *
-        * @var     array
-        * @access  private
+        * @var array
+        * @access private
         */
        var $_host_dead;
 
        /**
         * Is compression available?
         *
-        * @var     boolean
-        * @access  private
+        * @var boolean
+        * @access private
         */
        var $_have_zlib;
 
        /**
         * Do we want to use compression?
         *
-        * @var     boolean
-        * @access  private
+        * @var boolean
+        * @access private
         */
        var $_compress_enable;
 
        /**
         * At how many bytes should we compress?
         *
-        * @var     integer
-        * @access  private
+        * @var integer
+        * @access private
         */
        var $_compress_threshold;
 
        /**
         * Are we using persistent links?
         *
-        * @var     boolean
-        * @access  private
+        * @var boolean
+        * @access private
         */
        var $_persistent;
 
        /**
         * If only using one server; contains ip:port to connect to
         *
-        * @var     string
-        * @access  private
+        * @var string
+        * @access private
         */
        var $_single_sock;
 
        /**
         * Array containing ip:port or array(ip:port, weight)
         *
-        * @var     array
-        * @access  private
+        * @var array
+        * @access private
         */
        var $_servers;
 
        /**
         * Our bit buckets
         *
-        * @var     array
-        * @access  private
+        * @var array
+        * @access private
         */
        var $_buckets;
 
        /**
         * Total # of bit buckets we have
         *
-        * @var     integer
-        * @access  private
+        * @var integer
+        * @access private
         */
        var $_bucketcount;
 
        /**
         * # of total servers we have
         *
-        * @var     integer
-        * @access  private
+        * @var integer
+        * @access private
         */
        var $_active;
 
        /**
         * Stream timeout in seconds. Applies for example to fread()
         *
-        * @var     integer
-        * @access  private
+        * @var integer
+        * @access private
         */
        var $_timeout_seconds;
 
        /**
         * Stream timeout in microseconds
         *
-        * @var     integer
-        * @access  private
+        * @var integer
+        * @access private
         */
        var $_timeout_microseconds;
 
@@ -243,7 +243,7 @@ class MWMemcached {
         *
         * @param array $args Associative array of settings
         *
-        * @return  mixed
+        * @return mixed
         */
        public function __construct( $args ) {
                $this->set_servers( isset( $args['servers'] ) ? $args['servers'] : array() );
@@ -708,7 +708,7 @@ class MWMemcached {
         *
         * @param string $sock socket to close
         *
-        * @access  private
+        * @access private
         */
        function _close_sock( $sock ) {
                $host = array_search( $sock, $this->_cache_sock );
@@ -725,8 +725,8 @@ class MWMemcached {
         * @param $sock Integer: socket to connect
         * @param string $host Host:IP to connect to
         *
-        * @return  boolean
-        * @access  private
+        * @return boolean
+        * @access private
         */
        function _connect_sock( &$sock, $host ) {
                list( $ip, $port ) = preg_split( '/:(?=\d)/', $host );
@@ -767,7 +767,7 @@ class MWMemcached {
         *
         * @param string $sock socket to mark as dead
         *
-        * @access  private
+        * @access private
         */
        function _dead_sock( $sock ) {
                $host = array_search( $sock, $this->_cache_sock );