From cff7b38058012a9d38603c220019f82c4e85eded Mon Sep 17 00:00:00 2001 From: JaguarJack Date: Sun, 17 Jan 2021 11:17:37 +0800 Subject: [PATCH] =?UTF-8?q?update:=E5=BC=80=E5=90=AF=E7=9F=AD=E7=BA=BF?= =?UTF-8?q?=E9=87=8D=E8=BF=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/database.php | 2 +- .../phpExecutable/ExecutableFinder.php | 1 - .../phpExecutable/FindPhpExecutable.php | 84 ------------------- .../phpExecutable/PhpExecutableFinder.php | 1 - 4 files changed, 1 insertion(+), 87 deletions(-) delete mode 100644 extend/catcher/library/phpExecutable/ExecutableFinder.php delete mode 100644 extend/catcher/library/phpExecutable/FindPhpExecutable.php delete mode 100644 extend/catcher/library/phpExecutable/PhpExecutableFinder.php diff --git a/config/database.php b/config/database.php index 5b667dc..f084fd3 100644 --- a/config/database.php +++ b/config/database.php @@ -49,7 +49,7 @@ return [ // 是否严格检查字段是否存在 'fields_strict' => true, // 是否需要断线重连 - 'break_reconnect' => false, + 'break_reconnect' => true, // 监听SQL 'trigger_sql' => true, // 开启字段缓存 diff --git a/extend/catcher/library/phpExecutable/ExecutableFinder.php b/extend/catcher/library/phpExecutable/ExecutableFinder.php deleted file mode 100644 index b3d9bbc..0000000 --- a/extend/catcher/library/phpExecutable/ExecutableFinder.php +++ /dev/null @@ -1 +0,0 @@ - - * @author Johannes M. Schmitt - */ -class ExecutableFinder -{ - private $suffixes = ['.exe', '.bat', '.cmd', '.com']; - - /** - * Replaces default suffixes of executable. - */ - public function setSuffixes(array $suffixes) - { - $this->suffixes = $suffixes; - } - - /** - * Adds new possible suffix to check for executable. - * - * @param string $suffix - */ - public function addSuffix($suffix) - { - $this->suffixes[] = $suffix; - } - - /** - * Finds an executable by name. - * - * @param string $name The executable name (without the extension) - * @param string|null $default The default to return if no executable is found - * @param array $extraDirs Additional dirs to check into - * - * @return string|null The executable path or default value - */ - public function find($name, $default = null, array $extraDirs = []) - { - if (ini_get('open_basedir')) { - $searchPath = array_merge(explode(PATH_SEPARATOR, ini_get('open_basedir')), $extraDirs); - $dirs = []; - foreach ($searchPath as $path) { - // Silencing against https://bugs.php.net/69240 - if (@is_dir($path)) { - $dirs[] = $path; - } else { - if (basename($path) == $name && @is_executable($path)) { - return $path; - } - } - } - } else { - $dirs = array_merge( - explode(PATH_SEPARATOR, getenv('PATH') ?: getenv('Path')), - $extraDirs - ); - } - - $suffixes = ['']; - if ('\\' === \DIRECTORY_SEPARATOR) { - $pathExt = getenv('PATHEXT'); - $suffixes = array_merge($pathExt ? explode(PATH_SEPARATOR, $pathExt) : $this->suffixes, $suffixes); - } - foreach ($suffixes as $suffix) { - foreach ($dirs as $dir) { - if (@is_file($file = $dir.\DIRECTORY_SEPARATOR.$name.$suffix) && ('\\' === \DIRECTORY_SEPARATOR || @is_executable($file))) { - return $file; - } - } - } - - return $default; - } -} \ No newline at end of file diff --git a/extend/catcher/library/phpExecutable/PhpExecutableFinder.php b/extend/catcher/library/phpExecutable/PhpExecutableFinder.php deleted file mode 100644 index b3d9bbc..0000000 --- a/extend/catcher/library/phpExecutable/PhpExecutableFinder.php +++ /dev/null @@ -1 +0,0 @@ -