Project

General

Profile

Bug #22638 ยป 15388_01.diff

Administrator Admin, 2010-08-07 16:47

View differences:

t3lib/config_default.php (working copy)
'reverseProxySSL' => '', // String: '*' or list of IP addresses of proxies that use SSL (https) for the connection to the client, but an unencrypted connection (http) to the server. If '*' all proxies defined in SYS[reverseProxyIP] use SSL.
'reverseProxyPrefixSSL' => '', // String: prefix to be added to the internal URL (SCRIPT_NAME and REQUEST_URI) when accessing the server via an SSL proxy. This setting overrides SYS[reverseProxyPrefix].
'caching' => array(
'defaultFrontend' => 't3lib_cache_frontend_VariableFrontend',
'defaultBackend' => 't3lib_cache_backend_FileBackend',
'cacheFrontends' => array(
't3lib_cache_frontend_VariableFrontend' => 't3lib/cache/frontend/class.t3lib_cache_frontend_variablefrontend.php:t3lib_cache_frontend_VariableFrontend',
't3lib_cache_frontend_StringFrontend' => 't3lib/cache/frontend/class.t3lib_cache_frontend_stringfrontend.php:t3lib_cache_frontend_StringFrontend',
t3lib/cache/class.t3lib_cache_manager.php (working copy)
/**
* @var array
*/
protected $cacheConfigurations = array(
'default' => array(
'frontend' => 't3lib_cache_frontend_VariableFrontend',
'backend' => 't3lib_cache_backend_FileBackend',
'backendOptions' => array()
)
);
protected $cacheConfigurations = array();
/**
* Sets configurations for caches. The key of each entry specifies the
......
*/
public function initialize() {
foreach ($this->cacheConfigurations as $identifier => $configuration) {
if ($identifier !== 'default') {
$frontend = isset($configuration['frontend']) ? $configuration['frontend'] : $this->cacheConfigurations['default']['frontend'];
$backend = isset($configuration['backend']) ? $configuration['backend'] : $this->cacheConfigurations['default']['backend'];
$backendOptions = isset($configuration['backendOptions']) ? $configuration['backendOptions'] : $this->cacheConfigurations['default']['backendOptions'];
$this->cacheFactory->create($identifier, $frontend, $backend, $backendOptions);
}
$this->cacheFactory->create(
$identifier,
$configuration['frontend'],
$configuration['backend'],
$configuration['backendOptions']
);
}
}
tests/t3lib/cache/t3lib_cache_managerTest.php (working copy)
$mockCacheFactory->expects($this->at(2))->method('create')->with('cache2', 't3lib_cache_frontend_StringFrontend', 't3lib_cache_backend_NullBackend', array('foo' => 'bar'));
$cacheConfigurations = array(
'cache1' => array(),
'cache1' => array(
'frontend' => 't3lib_cache_frontend_VariableFrontend',
'backend' => 't3lib_cache_backend_FileBackend',
'backendOptions' => array(),
),
'cache2' => array(
'frontend' => 't3lib_cache_frontend_StringFrontend',
'backend' => 't3lib_cache_backend_NullBackend',
    (1-1/1)