Merge "Added $ttl sanity check to WANObjectCache::delete()"

diff --combined includes/libs/objectcache/WANObjectCache.php
index 3c6c282,c541a9e..a3bd531
--- 1/includes/libs/objectcache/WANObjectCache.php
--- 2/includes/libs/objectcache/WANObjectCache.php
+++ b/includes/libs/objectcache/WANObjectCache.php
@@@ -272,6 -272,8 +272,8 @@@ class WANObjectCache 
         */
        final public function delete( $key, $ttl = self::HOLDOFF_TTL ) {
                $key = self::VALUE_KEY_PREFIX . $key;
+               // Avoid indefinite key salting for sanity
+               $ttl = max( $ttl, 1 );
                // Update the local cluster immediately
                $ok = $this->cache->set( $key, self::PURGE_VAL_PREFIX . microtime( true ), $ttl );
                // Publish the purge to all clusters
@@@ -617,7 -619,7 +619,7 @@@
         * moves from $lowTTL to 0 seconds. This handles widely varying
         * levels of cache access traffic.
         *
 -       * @param float|INF $curTTL Approximate TTL left on the key if present
 +       * @param float $curTTL Approximate TTL left on the key if present
         * @param float $lowTTL Consider a refresh when $curTTL is less than this
         * @return bool
         */