details: https://hg.nginx.org/nginx/rev/7ce28b4cc57e
branches:
changeset: 7787:7ce28b4cc57e
user: Maxim Dounin <mdounin@mdounin.ru>
date: Fri Mar 05 17:16:13 2021 +0300
description:
SSL: fixed build by Sun C with old OpenSSL versions.

Sun C complains about "statement not reached" if a "return" is followed
by additional statements.

diffstat:

src/http/modules/ngx_http_grpc_module.c | 4 ++--
src/http/modules/ngx_http_proxy_module.c | 4 ++--
src/http/modules/ngx_http_ssl_module.c | 4 ++--
src/http/modules/ngx_http_uwsgi_module.c | 4 ++--
src/mail/ngx_mail_ssl_module.c | 4 ++--
src/stream/ngx_stream_proxy_module.c | 4 ++--
src/stream/ngx_stream_ssl_module.c | 4 ++--
7 files changed, 14 insertions(+), 14 deletions(-)

diffs (103 lines):

diff -r 529b73f75d19 -r 7ce28b4cc57e src/http/modules/ngx_http_grpc_module.c
--- a/src/http/modules/ngx_http_grpc_module.c Tue Mar 02 00:58:24 2021 +0300
+++ b/src/http/modules/ngx_http_grpc_module.c Fri Mar 05 17:16:13 2021 +0300
@@ -4841,9 +4841,9 @@ ngx_http_grpc_ssl_conf_command_check(ngx
{
#ifndef SSL_CONF_FLAG_FILE
return "is not supported on this platform";
+#else
+ return NGX_CONF_OK;
#endif
-
- return NGX_CONF_OK;
}


diff -r 529b73f75d19 -r 7ce28b4cc57e src/http/modules/ngx_http_proxy_module.c
--- a/src/http/modules/ngx_http_proxy_module.c Tue Mar 02 00:58:24 2021 +0300
+++ b/src/http/modules/ngx_http_proxy_module.c Fri Mar 05 17:16:13 2021 +0300
@@ -4913,9 +4913,9 @@ ngx_http_proxy_ssl_conf_command_check(ng
{
#ifndef SSL_CONF_FLAG_FILE
return "is not supported on this platform";
+#else
+ return NGX_CONF_OK;
#endif
-
- return NGX_CONF_OK;
}


diff -r 529b73f75d19 -r 7ce28b4cc57e src/http/modules/ngx_http_ssl_module.c
--- a/src/http/modules/ngx_http_ssl_module.c Tue Mar 02 00:58:24 2021 +0300
+++ b/src/http/modules/ngx_http_ssl_module.c Fri Mar 05 17:16:13 2021 +0300
@@ -1274,9 +1274,9 @@ ngx_http_ssl_conf_command_check(ngx_conf
{
#ifndef SSL_CONF_FLAG_FILE
return "is not supported on this platform";
+#else
+ return NGX_CONF_OK;
#endif
-
- return NGX_CONF_OK;
}


diff -r 529b73f75d19 -r 7ce28b4cc57e src/http/modules/ngx_http_uwsgi_module.c
--- a/src/http/modules/ngx_http_uwsgi_module.c Tue Mar 02 00:58:24 2021 +0300
+++ b/src/http/modules/ngx_http_uwsgi_module.c Fri Mar 05 17:16:13 2021 +0300
@@ -2398,9 +2398,9 @@ ngx_http_uwsgi_ssl_conf_command_check(ng
{
#ifndef SSL_CONF_FLAG_FILE
return "is not supported on this platform";
+#else
+ return NGX_CONF_OK;
#endif
-
- return NGX_CONF_OK;
}


diff -r 529b73f75d19 -r 7ce28b4cc57e src/mail/ngx_mail_ssl_module.c
--- a/src/mail/ngx_mail_ssl_module.c Tue Mar 02 00:58:24 2021 +0300
+++ b/src/mail/ngx_mail_ssl_module.c Fri Mar 05 17:16:13 2021 +0300
@@ -682,7 +682,7 @@ ngx_mail_ssl_conf_command_check(ngx_conf
{
#ifndef SSL_CONF_FLAG_FILE
return "is not supported on this platform";
+#else
+ return NGX_CONF_OK;
#endif
-
- return NGX_CONF_OK;
}
diff -r 529b73f75d19 -r 7ce28b4cc57e src/stream/ngx_stream_proxy_module.c
--- a/src/stream/ngx_stream_proxy_module.c Tue Mar 02 00:58:24 2021 +0300
+++ b/src/stream/ngx_stream_proxy_module.c Fri Mar 05 17:16:13 2021 +0300
@@ -1026,9 +1026,9 @@ ngx_stream_proxy_ssl_conf_command_check(
{
#ifndef SSL_CONF_FLAG_FILE
return "is not supported on this platform";
+#else
+ return NGX_CONF_OK;
#endif
-
- return NGX_CONF_OK;
}


diff -r 529b73f75d19 -r 7ce28b4cc57e src/stream/ngx_stream_ssl_module.c
--- a/src/stream/ngx_stream_ssl_module.c Tue Mar 02 00:58:24 2021 +0300
+++ b/src/stream/ngx_stream_ssl_module.c Fri Mar 05 17:16:13 2021 +0300
@@ -1061,9 +1061,9 @@ ngx_stream_ssl_conf_command_check(ngx_co
{
#ifndef SSL_CONF_FLAG_FILE
return "is not supported on this platform";
+#else
+ return NGX_CONF_OK;
#endif
-
- return NGX_CONF_OK;
}


_______________________________________________
nginx-devel mailing list
nginx-devel@nginx.org
http://mailman.nginx.org/mailman/listinfo/nginx-devel