mirror-fastadminnet/framework
1
0
Fork 0
mirror of https://gitee.com/fastadminnet/framework.git synced 2026-07-05 14:52:47 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/top-think/framework

Browse Source
This commit is contained in:
thinkphp
2018-01-01 20:19:31 +08:00
parent 282d04e4af f264bdfbd8
commit 9a68abd572
3 changed files with 66 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
library/think/cache/driver/File.php vendored
View File

@@ -109,7 +109,7 @@ class File extends Driver
$content = file_get_contents($filename);
if (false !== $content) {
$expire = (int) substr($content, 8, 12);
if (0 != $expire && $_SERVER['REQUEST_TIME'] > filemtime($filename) + $expire) {
if (0 != $expire && time() > filemtime($filename) + $expire) {
return $default;
}
$content = substr($content, 32);

7
library/think/cache/driver/Redis.php vendored
View File

@@ -46,9 +46,12 @@ class Redis extends Driver
if (!empty($options)) {
$this->options = array_merge($this->options, $options);
}
$func = $this->options['persistent'] ? 'pconnect' : 'connect';
$this->handler = new \Redis;
$this->handler->$func($this->options['host'], $this->options['port'], $this->options['timeout']);
if ($this->options['persistent']) {
$this->handler->pconnect($this->options['host'], $this->options['port'], $this->options['timeout'], 'persistent_id_' . $this->options['select']);
} else {
$this->handler->connect($this->options['host'], $this->options['port'], $this->options['timeout']);
}
if ('' != $this->options['password']) {
$this->handler->auth($this->options['password']);