diff options
| author | Maxim Dounin <mdounin@mdounin.ru> | 2021-03-05 17:16:13 +0300 |
|---|---|---|
| committer | Maxim Dounin <mdounin@mdounin.ru> | 2021-03-05 17:16:13 +0300 |
| commit | 797ac536fe2cc0a311a72ddb861784f320991beb (patch) | |
| tree | 38d882f2982404fa241c0a91d7dfec40f44435ba | |
| parent | a38a8438b8116d4f3674ea8a0cb194a8fb3f5622 (diff) | |
| download | nginx-797ac536fe2cc0a311a72ddb861784f320991beb.tar.gz nginx-797ac536fe2cc0a311a72ddb861784f320991beb.tar.bz2 | |
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.
| -rw-r--r-- | src/http/modules/ngx_http_grpc_module.c | 4 | ||||
| -rw-r--r-- | src/http/modules/ngx_http_proxy_module.c | 4 | ||||
| -rw-r--r-- | src/http/modules/ngx_http_ssl_module.c | 4 | ||||
| -rw-r--r-- | src/http/modules/ngx_http_uwsgi_module.c | 4 | ||||
| -rw-r--r-- | src/mail/ngx_mail_ssl_module.c | 4 | ||||
| -rw-r--r-- | src/stream/ngx_stream_proxy_module.c | 4 | ||||
| -rw-r--r-- | src/stream/ngx_stream_ssl_module.c | 4 |
7 files changed, 14 insertions, 14 deletions
diff --git a/src/http/modules/ngx_http_grpc_module.c b/src/http/modules/ngx_http_grpc_module.c index aa7576561..f5bf575c2 100644 --- 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_conf_t *cf, void *post, void *data) { #ifndef SSL_CONF_FLAG_FILE return "is not supported on this platform"; -#endif - +#else return NGX_CONF_OK; +#endif } diff --git a/src/http/modules/ngx_http_proxy_module.c b/src/http/modules/ngx_http_proxy_module.c index 27266676d..a63c3ed54 100644 --- 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(ngx_conf_t *cf, void *post, void *data) { #ifndef SSL_CONF_FLAG_FILE return "is not supported on this platform"; -#endif - +#else return NGX_CONF_OK; +#endif } diff --git a/src/http/modules/ngx_http_ssl_module.c b/src/http/modules/ngx_http_ssl_module.c index e062b03a1..a47d6963a 100644 --- 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_t *cf, void *post, void *data) { #ifndef SSL_CONF_FLAG_FILE return "is not supported on this platform"; -#endif - +#else return NGX_CONF_OK; +#endif } diff --git a/src/http/modules/ngx_http_uwsgi_module.c b/src/http/modules/ngx_http_uwsgi_module.c index bf2732675..1334f44c9 100644 --- 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(ngx_conf_t *cf, void *post, void *data) { #ifndef SSL_CONF_FLAG_FILE return "is not supported on this platform"; -#endif - +#else return NGX_CONF_OK; +#endif } diff --git a/src/mail/ngx_mail_ssl_module.c b/src/mail/ngx_mail_ssl_module.c index d560bd60c..7eae83e25 100644 --- 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_t *cf, void *post, void *data) { #ifndef SSL_CONF_FLAG_FILE return "is not supported on this platform"; -#endif - +#else return NGX_CONF_OK; +#endif } diff --git a/src/stream/ngx_stream_proxy_module.c b/src/stream/ngx_stream_proxy_module.c index 0c86083c5..01cda7a36 100644 --- 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(ngx_conf_t *cf, void *post, void *data) { #ifndef SSL_CONF_FLAG_FILE return "is not supported on this platform"; -#endif - +#else return NGX_CONF_OK; +#endif } diff --git a/src/stream/ngx_stream_ssl_module.c b/src/stream/ngx_stream_ssl_module.c index ccd359f3b..d8c0471ea 100644 --- 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_conf_t *cf, void *post, void *data) { #ifndef SSL_CONF_FLAG_FILE return "is not supported on this platform"; -#endif - +#else return NGX_CONF_OK; +#endif } |
