From: Roan Kattouw <catrope@users.mediawiki.org>
Date: Wed, 10 Aug 2011 21:15:57 +0000 (+0000)
Subject: Merge r93797 to trunk, in a somewhat modified form: clamp expiries for memcached... 
X-Git-Tag: 1.31.0-rc.0~28370
X-Git-Url: http://git.cyclocoop.org/data/Luca_Pacioli_%28Gemaelde%29.jpeg?a=commitdiff_plain;h=e877e8f5e03e665f07e4b9df3f5ad85e94bdd42b;p=lhc%2Fweb%2Fwiklou.git

Merge r93797 to trunk, in a somewhat modified form: clamp expiries for memcached to 30 days, higher values give trouble apparently
---

diff --git a/includes/objectcache/MemcachedClient.php b/includes/objectcache/MemcachedClient.php
index 1d64f45374..51d312ff42 100644
--- a/includes/objectcache/MemcachedClient.php
+++ b/includes/objectcache/MemcachedClient.php
@@ -948,6 +948,12 @@ class MWMemcached {
 		} else {
 			$this->stats[$cmd] = 1;
 		}
+		
+		// Memcached doesn't seem to handle very high TTL values very well,
+		// so clamp them at 30 days
+		if ( $exp > 2592000 ) {
+			$exp = 2592000;
+		}
 
 		$flags = 0;