Compare commits

..

No commits in common. "96df9305b6ba71a0e7bc611d6003de8c05943e4e" and "c9c72cc847b75fc39a4ed58072e4b2373d4908fe" have entirely different histories.

3 changed files with 4 additions and 8 deletions

View File

@ -22,6 +22,4 @@ RUN composer install --optimize-autoloader --no-cache --no-dev \
ENV ENABLE_WEB=true \
ENABLE_HORIZON=true \
ENABLE_REDIS=false
EXPOSE 7001
CMD ["/usr/bin/supervisord", "-c", "/etc/supervisor/conf.d/supervisord.conf"]

View File

@ -116,11 +116,9 @@ class UniProxyController extends Controller
...$baseConfig,
'tls' => (int) $protocolSettings['tls'],
'flow' => $protocolSettings['flow'],
'tls_settings' =>
match ((int) $protocolSettings['tls']) {
2 => $protocolSettings['reality_settings'],
default => $protocolSettings['tls_settings']
}
'tls_settings' => [...(int) $protocolSettings['tls'] === 1
? $protocolSettings['tls_settings']
: $protocolSettings['reality_settings']]
],
'hysteria' => [
'server_port' => (int) $serverPort,

View File

@ -141,7 +141,7 @@ class Server extends Model
private function castValueWithConfig($value, array $config)
{
if ($value === null && $config['type'] !== 'object') {
if ($value === null) {
return $config['default'] ?? null;
}