修复 Reverb 配置缓存时的函数重定义

This commit is contained in:
pllx
2026-04-29 11:18:08 +08:00
parent 317dfd04d7
commit dc9c09c722
+3 -10
View File
@@ -1,13 +1,6 @@
<?php
/**
* 规范化 Reverb 允许的来源域名列表,兼容完整 URL、主机名和逗号分隔写法。
*
* @param string|null $rawOrigins 环境变量中声明的来源列表
* @return array<int, string>
*/
function chatroom_normalize_reverb_allowed_origins(?string $rawOrigins): array
{
$normalizeReverbAllowedOrigins = static function (?string $rawOrigins): array {
if ($rawOrigins === null || trim($rawOrigins) === '') {
return ['*'];
}
@@ -35,7 +28,7 @@ function chatroom_normalize_reverb_allowed_origins(?string $rawOrigins): array
}
return array_values(array_unique($normalizedOrigins));
}
};
return [
@@ -120,7 +113,7 @@ return [
'useTLS' => env('REVERB_SCHEME', 'https') === 'https',
],
// Reverb 内部按 Origin 的主机名比对,这里统一转成 host,避免把完整 URL 写进 .env 后被误拒绝。
'allowed_origins' => chatroom_normalize_reverb_allowed_origins(env('REVERB_ALLOWED_ORIGIN')),
'allowed_origins' => $normalizeReverbAllowedOrigins(env('REVERB_ALLOWED_ORIGIN')),
'ping_interval' => env('REVERB_APP_PING_INTERVAL', 60),
'activity_timeout' => env('REVERB_APP_ACTIVITY_TIMEOUT', 30),
'max_connections' => env('REVERB_APP_MAX_CONNECTIONS'),