Refresh kohana from upstream svn trunk r3771.

During this process, remove a considerable number of files from kohana
that we will not be needing in Gallery3, including the following files
and directories:
    kohana/application
    kohana/example.htaccess
    kohana/index.php
    kohana/install.php
    kohana/kohana.png
    kohana/modules/archive
    kohana/modules/auth
    kohana/modules/flot
    kohana/modules/gmaps
    kohana/modules/kodoc
    kohana/modules/payment
    kohana/modules/smarty
    kohana/modules/unit_test/i18n
    kohana/modules/unit_test/tests/Example_Test.php
    kohana/modules/unit_test/tests/Valid_Test.php
    kohana/system/config/captcha.php
    kohana/system/controllers/captcha.php
    kohana/system/fonts
    kohana/system/i18n
    kohana/system/libraries/Calendar.php
    kohana/system/libraries/Calendar_Event.php
    kohana/system/libraries/Captcha.php
    kohana/system/libraries/Tagcloud.php
    kohana/system/vendor
    kohana/system/views/pagination
    kohana/system/views/kohana_calendar.php

1 files changed, 78 insertions, 0 deletions

diff --git a/kohana/libraries/drivers/Cache/Memcache.php b/kohana/libraries/drivers/Cache/Memcache.php
new file mode 100644
index 00000000..ef5b8440
--- /dev/null
+++ b/kohana/libraries/drivers/Cache/Memcache.php
@@ -0,0 +1,78 @@
+<?php defined('SYSPATH') OR die('No direct access allowed.');
+/**
+ * Memcache-based Cache driver.
+ *
+ * $Id$
+ *
+ * @package    Cache
+ * @author     Kohana Team
+ * @copyright  (c) 2007-2008 Kohana Team
+ * @license    http://kohanaphp.com/license.html
+ */
+class Cache_Memcache_Driver implements Cache_Driver {
+
+	// Cache backend object and flags
+	protected $backend;
+	protected $flags;
+
+	public function __construct()
+	{
+		if ( ! extension_loaded('memcache'))
+			throw new Kohana_Exception('cache.extension_not_loaded', 'memcache');
+
+		$this->backend = new Memcache;
+		$this->flags = Kohana::config('cache_memcache.compression') ? MEMCACHE_COMPRESSED : 0;
+
+		$servers = Kohana::config('cache_memcache.servers');
+
+		foreach ($servers as $server)
+		{
+			// Make sure all required keys are set
+			$server += array('host' => '127.0.0.1', 'port' => 11211, 'persistent' => FALSE);
+
+			// Add the server to the pool
+			$this->backend->addServer($server['host'], $server['port'], (bool) $server['persistent'])
+				or Kohana::log('error', 'Cache: Connection failed: '.$server['host']);
+		}
+	}
+
+	public function find($tag)
+	{
+		return FALSE;
+	}
+
+	public function get($id)
+	{
+		return (($return = $this->backend->get($id)) === FALSE) ? NULL : $return;
+	}
+
+	public function set($id, $data, $tags, $lifetime)
+	{
+		count($tags) and Kohana::log('error', 'Cache: Tags are unsupported by the memcache driver');
+
+		// Memcache driver expects unix timestamp
+		if ($lifetime !== 0)
+		{
+			$lifetime += time();
+		}
+
+		return $this->backend->set($id, $data, $this->flags, $lifetime);
+	}
+
+	public function delete($id, $tag = FALSE)
+	{
+		if ($id === TRUE)
+			return $this->backend->flush();
+
+		if ($tag == FALSE)
+			return $this->backend->delete($id);
+
+		return TRUE;
+	}
+
+	public function delete_expired()
+	{
+		return TRUE;
+	}
+
+} // End Cache Memcache Driver