Merge "objectcache: Add a clear() method to HashBagOStuff"

diff --combined includes/libs/objectcache/HashBagOStuff.php
index 7a514ef,6a43403..c1ee065
--- 1/includes/libs/objectcache/HashBagOStuff.php
--- 2/includes/libs/objectcache/HashBagOStuff.php
+++ b/includes/libs/objectcache/HashBagOStuff.php
@@@ -51,7 -51,7 +51,7 @@@ class HashBagOStuff extends BagOStuff 
  
        protected function expire( $key ) {
                $et = $this->bag[$key][self::KEY_EXP];
 -              if ( $et == 0 || $et > time() ) {
 +              if ( $et == self::TTL_INDEFINITE || $et > time() ) {
                        return false;
                }
  
@@@ -94,4 -94,8 +94,8 @@@
  
                return true;
        }
+ 
+       public function clear() {
+               $this->bag = array();
+       }
  }