Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Jozef Sroka
ISPConfig 3
Commits
1e01e0dd
Commit
1e01e0dd
authored
Dec 21, 2020
by
Jozef Sroka
Browse files
fix tls1.3 in nginx - more precise selector
parent
f77cf03c
Pipeline
#6912
passed with stage
in 8 minutes and 40 seconds
Changes
1
Pipelines
2
Hide whitespace changes
Inline
Side-by-side
server/plugins-available/nginx_plugin.inc.php
View file @
1e01e0dd
...
...
@@ -1632,8 +1632,8 @@ class nginx_plugin {
$vhost_data
[
'logging'
]
=
$web_config
[
'logging'
];
// Provide TLS 1.3 support if Nginx version is >= 1.13.0 and when it was linked against OpenSSL(>=1.1.1) at build time and when it was linked against OpenSSL(>=1.1.1) at runtime.
$nginx_openssl_build_ver
=
$app
->
system
->
exec_safe
(
'nginx -V 2>&1 | grep OpenSSL | sed \'s/.*built\([a-zA-Z ]*\)OpenSSL \([0-9.]*\).*/\2/\''
);
$nginx_openssl_running_ver
=
$app
->
system
->
exec_safe
(
'nginx -V 2>&1 | grep \'running with\' | sed \'s/.*running\([a-zA-Z ]*\)OpenSSL \([0-9.]*\).*/\2/\''
);
$nginx_openssl_build_ver
=
$app
->
system
->
exec_safe
(
'nginx -V 2>&1 | grep
\'built with
OpenSSL
\'
| sed \'s/.*built\([a-zA-Z ]*\)OpenSSL \([0-9.]*\).*/\2/\''
);
$nginx_openssl_running_ver
=
$app
->
system
->
exec_safe
(
'nginx -V 2>&1 | grep \'running with
OpenSSL
\' | sed \'s/.*running\([a-zA-Z ]*\)OpenSSL \([0-9.]*\).*/\2/\''
);
if
(
version_compare
(
$app
->
system
->
getnginxversion
(
true
),
'1.13.0'
,
'>='
)
&&
version_compare
(
$nginx_openssl_build_ver
,
'1.1.1'
,
'>='
)
&&
(
empty
(
$nginx_openssl_running_ver
)
||
version_compare
(
$nginx_openssl_running_ver
,
'1.1.1'
,
'>='
)))
{
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment