Mercurial > hg > nginx

changeset 7787:7ce28b4cc57e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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.
author Maxim Dounin <mdounin@mdounin.ru>
date Fri, 05 Mar 2021 17:16:13 +0300
parents 529b73f75d19
children 9ca8fb98ef1c
files src/http/modules/ngx_http_grpc_module.c src/http/modules/ngx_http_proxy_module.c src/http/modules/ngx_http_ssl_module.c src/http/modules/ngx_http_uwsgi_module.c src/mail/ngx_mail_ssl_module.c src/stream/ngx_stream_proxy_module.c src/stream/ngx_stream_ssl_module.c
diffstat 7 files changed, 14 insertions(+), 14 deletions(-) [+]
line wrap: on
line diff
--- a/src/http/modules/ngx_http_grpc_module.c
+++ b/src/http/modules/ngx_http_grpc_module.c
@@ -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;
 }
 
 
--- a/src/http/modules/ngx_http_proxy_module.c
+++ b/src/http/modules/ngx_http_proxy_module.c
@@ -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;
 }
 
 
--- a/src/http/modules/ngx_http_ssl_module.c
+++ b/src/http/modules/ngx_http_ssl_module.c
@@ -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;
 }
 
 
--- a/src/http/modules/ngx_http_uwsgi_module.c
+++ b/src/http/modules/ngx_http_uwsgi_module.c
@@ -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;
 }
 
 
--- a/src/mail/ngx_mail_ssl_module.c
+++ b/src/mail/ngx_mail_ssl_module.c
@@ -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;
 }
--- a/src/stream/ngx_stream_proxy_module.c
+++ b/src/stream/ngx_stream_proxy_module.c
@@ -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;
 }
 
 
--- a/src/stream/ngx_stream_ssl_module.c
+++ b/src/stream/ngx_stream_ssl_module.c
@@ -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;
 }