details: https://hg.nginx.org/njs/rev/9502fed1bd6b
branches:
changeset: 1724:9502fed1bd6b
user: Dmitry Volyntsev <xei...@nginx.com>
date: Thu Oct 14 15:18:47 2021 +0000
description:
Style.
diffstat:
nginx/ngx_http_js_module.c | 24 ++++++++++++------------
nginx/ngx_stream_js_module.c | 24 ++++++++++++------------
2 files changed, 24 insertions(+), 24 deletions(-)
diffs (134 lines):
diff -r 1b63a726fcea -r 9502fed1bd6b nginx/ngx_http_js_module.c
--- a/nginx/ngx_http_js_module.c Wed Oct 13 16:31:00 2021 +0000
+++ b/nginx/ngx_http_js_module.c Thu Oct 14 15:18:47 2021 +0000
@@ -233,7 +233,7 @@ static char *ngx_http_js_merge_loc_conf(
void *child);
#if (NGX_HTTP_SSL)
-static char * ngx_http_js_set_ssl(ngx_conf_t *cf, ngx_http_js_loc_conf_t
*plcf);
+static char * ngx_http_js_set_ssl(ngx_conf_t *cf, ngx_http_js_loc_conf_t
*jlcf);
#endif
static ngx_ssl_t *ngx_http_js_ssl(njs_vm_t *vm, ngx_http_request_t *r);
@@ -4087,7 +4087,7 @@ ngx_http_js_merge_loc_conf(ngx_conf_t *c
#if (NGX_HTTP_SSL)
static char *
-ngx_http_js_set_ssl(ngx_conf_t *cf, ngx_http_js_loc_conf_t *plcf)
+ngx_http_js_set_ssl(ngx_conf_t *cf, ngx_http_js_loc_conf_t *jlcf)
{
ngx_ssl_t *ssl;
ngx_pool_cleanup_t *cln;
@@ -4097,10 +4097,10 @@ ngx_http_js_set_ssl(ngx_conf_t *cf, ngx_
return NGX_CONF_ERROR;
}
- plcf->ssl = ssl;
+ jlcf->ssl = ssl;
ssl->log = cf->log;
- if (ngx_ssl_create(ssl, plcf->ssl_protocols, NULL) != NGX_OK) {
+ if (ngx_ssl_create(ssl, jlcf->ssl_protocols, NULL) != NGX_OK) {
return NGX_CONF_ERROR;
}
@@ -4113,12 +4113,12 @@ ngx_http_js_set_ssl(ngx_conf_t *cf, ngx_
cln->handler = ngx_ssl_cleanup_ctx;
cln->data = ssl;
- if (ngx_ssl_ciphers(NULL, ssl, &plcf->ssl_ciphers, 0) != NGX_OK) {
+ if (ngx_ssl_ciphers(NULL, ssl, &jlcf->ssl_ciphers, 0) != NGX_OK) {
return NGX_CONF_ERROR;
}
- if (ngx_ssl_trusted_certificate(cf, ssl, &plcf->ssl_trusted_certificate,
- plcf->ssl_verify_depth)
+ if (ngx_ssl_trusted_certificate(cf, ssl, &jlcf->ssl_trusted_certificate,
+ jlcf->ssl_verify_depth)
!= NGX_OK)
{
return NGX_CONF_ERROR;
@@ -4134,11 +4134,11 @@ static ngx_ssl_t *
ngx_http_js_ssl(njs_vm_t *vm, ngx_http_request_t *r)
{
#if (NGX_HTTP_SSL)
- ngx_http_js_loc_conf_t *plcf;
-
- plcf = ngx_http_get_module_loc_conf(r, ngx_http_js_module);
-
- return plcf->ssl;
+ ngx_http_js_loc_conf_t *jlcf;
+
+ jlcf = ngx_http_get_module_loc_conf(r, ngx_http_js_module);
+
+ return jlcf->ssl;
#else
return NULL;
#endif
diff -r 1b63a726fcea -r 9502fed1bd6b nginx/ngx_stream_js_module.c
--- a/nginx/ngx_stream_js_module.c Wed Oct 13 16:31:00 2021 +0000
+++ b/nginx/ngx_stream_js_module.c Thu Oct 14 15:18:47 2021 +0000
@@ -147,7 +147,7 @@ static ngx_int_t ngx_stream_js_init(ngx_
#if (NGX_SSL)
static char * ngx_stream_js_set_ssl(ngx_conf_t *cf,
- ngx_stream_js_srv_conf_t *pscf);
+ ngx_stream_js_srv_conf_t *jscf);
#endif
static ngx_ssl_t *ngx_stream_js_ssl(njs_vm_t *vm, ngx_stream_session_t *s);
@@ -2060,7 +2060,7 @@ ngx_stream_js_init(ngx_conf_t *cf)
#if (NGX_SSL)
static char *
-ngx_stream_js_set_ssl(ngx_conf_t *cf, ngx_stream_js_srv_conf_t *pscf)
+ngx_stream_js_set_ssl(ngx_conf_t *cf, ngx_stream_js_srv_conf_t *jscf)
{
ngx_ssl_t *ssl;
ngx_pool_cleanup_t *cln;
@@ -2070,10 +2070,10 @@ ngx_stream_js_set_ssl(ngx_conf_t *cf, ng
return NGX_CONF_ERROR;
}
- pscf->ssl = ssl;
+ jscf->ssl = ssl;
ssl->log = cf->log;
- if (ngx_ssl_create(ssl, pscf->ssl_protocols, NULL) != NGX_OK) {
+ if (ngx_ssl_create(ssl, jscf->ssl_protocols, NULL) != NGX_OK) {
return NGX_CONF_ERROR;
}
@@ -2086,12 +2086,12 @@ ngx_stream_js_set_ssl(ngx_conf_t *cf, ng
cln->handler = ngx_ssl_cleanup_ctx;
cln->data = ssl;
- if (ngx_ssl_ciphers(NULL, ssl, &pscf->ssl_ciphers, 0) != NGX_OK) {
+ if (ngx_ssl_ciphers(NULL, ssl, &jscf->ssl_ciphers, 0) != NGX_OK) {
return NGX_CONF_ERROR;
}
- if (ngx_ssl_trusted_certificate(cf, ssl, &pscf->ssl_trusted_certificate,
- pscf->ssl_verify_depth)
+ if (ngx_ssl_trusted_certificate(cf, ssl, &jscf->ssl_trusted_certificate,
+ jscf->ssl_verify_depth)
!= NGX_OK)
{
return NGX_CONF_ERROR;
@@ -2107,11 +2107,11 @@ static ngx_ssl_t *
ngx_stream_js_ssl(njs_vm_t *vm, ngx_stream_session_t *s)
{
#if (NGX_SSL)
- ngx_stream_js_srv_conf_t *pscf;
-
- pscf = ngx_stream_get_module_srv_conf(s, ngx_stream_js_module);
-
- return pscf->ssl;
+ ngx_stream_js_srv_conf_t *jscf;
+
+ jscf = ngx_stream_get_module_srv_conf(s, ngx_stream_js_module);
+
+ return jscf->ssl;
#else
return NULL;
#endif
_______________________________________________
nginx-devel mailing list
nginx-devel@nginx.org
http://mailman.nginx.org/mailman/listinfo/nginx-devel
