Hello!

Nginx is famous for code readability and neat code format. I use the tool(
https://github.com/openresty/openresty-devel-utils) to try to unify the
incorrect front spaces, Here is my attempt at http/modules.

# HG changeset patch
# User Jinhua Tan <312841925@qq.com>
# Date 1589948645 -28800
# Wed May 20 12:24:05 2020 +0800
# Node ID 3242f98298975e556a7e87130611ce84799fe935
# Parent 10678810de74edc4c02d5cd7303f0099eee9fac3
Style(http/modules): fix the incorrect front spaces to unite style.

diff -r 10678810de74 -r 3242f9829897
src/http/modules/ngx_http_access_module.c
--- a/src/http/modules/ngx_http_access_module.c Wed May 20 12:21:32 2020
+0800
+++ b/src/http/modules/ngx_http_access_module.c Wed May 20 12:24:05 2020
+0800
@@ -327,7 +327,7 @@

if (rc == NGX_ERROR) {
ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
- "invalid parameter \"%V\"", &value[1]);
+ "invalid parameter \"%V\"", &value[1]);
return NGX_CONF_ERROR;
}

diff -r 10678810de74 -r 3242f9829897 src/http/modules/ngx_http_dav_module.c
--- a/src/http/modules/ngx_http_dav_module.c Wed May 20 12:21:32 2020 +0800
+++ b/src/http/modules/ngx_http_dav_module.c Wed May 20 12:24:05 2020 +0800
@@ -1116,10 +1116,10 @@
ngx_http_dav_loc_conf_t *conf = child;

ngx_conf_merge_bitmask_value(conf->methods, prev->methods,
- (NGX_CONF_BITMASK_SET|NGX_HTTP_DAV_OFF));
+ (NGX_CONF_BITMASK_SET|NGX_HTTP_DAV_OFF));

ngx_conf_merge_uint_value(conf->min_delete_depth,
- prev->min_delete_depth, 0);
+ prev->min_delete_depth, 0);

ngx_conf_merge_uint_value(conf->access, prev->access, 0600);

diff -r 10678810de74 -r 3242f9829897
src/http/modules/ngx_http_fastcgi_module.c
--- a/src/http/modules/ngx_http_fastcgi_module.c Wed May 20 12:21:32 2020
+0800
+++ b/src/http/modules/ngx_http_fastcgi_module.c Wed May 20 12:24:05 2020
+0800
@@ -2805,7 +2805,7 @@

if (conf->upstream.store == NGX_CONF_UNSET) {
ngx_conf_merge_value(conf->upstream.store,
- prev->upstream.store, 0);
+ prev->upstream.store, 0);

conf->upstream.store_lengths = prev->upstream.store_lengths;
conf->upstream.store_values = prev->upstream.store_values;
@@ -2818,22 +2818,22 @@
prev->upstream.next_upstream_tries, 0);

ngx_conf_merge_value(conf->upstream.buffering,
- prev->upstream.buffering, 1);
+ prev->upstream.buffering, 1);

ngx_conf_merge_value(conf->upstream.request_buffering,
- prev->upstream.request_buffering, 1);
+ prev->upstream.request_buffering, 1);

ngx_conf_merge_value(conf->upstream.ignore_client_abort,
- prev->upstream.ignore_client_abort, 0);
+ prev->upstream.ignore_client_abort, 0);

ngx_conf_merge_value(conf->upstream.force_ranges,
- prev->upstream.force_ranges, 0);
+ prev->upstream.force_ranges, 0);

ngx_conf_merge_ptr_value(conf->upstream.local,
- prev->upstream.local, NULL);
+ prev->upstream.local, NULL);

ngx_conf_merge_value(conf->upstream.socket_keepalive,
- prev->upstream.socket_keepalive, 0);
+ prev->upstream.socket_keepalive, 0);

ngx_conf_merge_msec_value(conf->upstream.connect_timeout,
prev->upstream.connect_timeout, 60000);
@@ -2951,15 +2951,15 @@


ngx_conf_merge_bitmask_value(conf->upstream.ignore_headers,
- prev->upstream.ignore_headers,
- NGX_CONF_BITMASK_SET);
+ prev->upstream.ignore_headers,
+ NGX_CONF_BITMASK_SET);


ngx_conf_merge_bitmask_value(conf->upstream.next_upstream,
- prev->upstream.next_upstream,
- (NGX_CONF_BITMASK_SET
- |NGX_HTTP_UPSTREAM_FT_ERROR
- |NGX_HTTP_UPSTREAM_FT_TIMEOUT));
+ prev->upstream.next_upstream,
+ (NGX_CONF_BITMASK_SET
+ |NGX_HTTP_UPSTREAM_FT_ERROR
+ |NGX_HTTP_UPSTREAM_FT_TIMEOUT));

if (conf->upstream.next_upstream & NGX_HTTP_UPSTREAM_FT_OFF) {
conf->upstream.next_upstream = NGX_CONF_BITMASK_SET
@@ -2978,7 +2978,7 @@

if (conf->upstream.cache == NGX_CONF_UNSET) {
ngx_conf_merge_value(conf->upstream.cache,
- prev->upstream.cache, 0);
+ prev->upstream.cache, 0);

conf->upstream.cache_zone = prev->upstream.cache_zone;
conf->upstream.cache_value = prev->upstream.cache_value;
@@ -3000,13 +3000,13 @@
prev->upstream.cache_min_uses, 1);

ngx_conf_merge_off_value(conf->upstream.cache_max_range_offset,
- prev->upstream.cache_max_range_offset,
- NGX_MAX_OFF_T_VALUE);
+ prev->upstream.cache_max_range_offset,
+ NGX_MAX_OFF_T_VALUE);

ngx_conf_merge_bitmask_value(conf->upstream.cache_use_stale,
- prev->upstream.cache_use_stale,
- (NGX_CONF_BITMASK_SET
- |NGX_HTTP_UPSTREAM_FT_OFF));
+ prev->upstream.cache_use_stale,
+ (NGX_CONF_BITMASK_SET
+ |NGX_HTTP_UPSTREAM_FT_OFF));

if (conf->upstream.cache_use_stale & NGX_HTTP_UPSTREAM_FT_OFF) {
conf->upstream.cache_use_stale = NGX_CONF_BITMASK_SET
@@ -3042,7 +3042,7 @@
}

ngx_conf_merge_value(conf->upstream.cache_lock,
- prev->upstream.cache_lock, 0);
+ prev->upstream.cache_lock, 0);

ngx_conf_merge_msec_value(conf->upstream.cache_lock_timeout,
prev->upstream.cache_lock_timeout, 5000);
@@ -3051,20 +3051,20 @@
prev->upstream.cache_lock_age, 5000);

ngx_conf_merge_value(conf->upstream.cache_revalidate,
- prev->upstream.cache_revalidate, 0);
+ prev->upstream.cache_revalidate, 0);

ngx_conf_merge_value(conf->upstream.cache_background_update,
- prev->upstream.cache_background_update, 0);
+ prev->upstream.cache_background_update, 0);

#endif

ngx_conf_merge_value(conf->upstream.pass_request_headers,
- prev->upstream.pass_request_headers, 1);
+ prev->upstream.pass_request_headers, 1);
ngx_conf_merge_value(conf->upstream.pass_request_body,
- prev->upstream.pass_request_body, 1);
+ prev->upstream.pass_request_body, 1);

ngx_conf_merge_value(conf->upstream.intercept_errors,
- prev->upstream.intercept_errors, 0);
+ prev->upstream.intercept_errors, 0);

ngx_conf_merge_ptr_value(conf->catch_stderr, prev->catch_stderr, NULL);

diff -r 10678810de74 -r 3242f9829897 src/http/modules/ngx_http_grpc_module.c
--- a/src/http/modules/ngx_http_grpc_module.c Wed May 20 12:21:32 2020 +0800
+++ b/src/http/modules/ngx_http_grpc_module.c Wed May 20 12:24:05 2020 +0800
@@ -4357,10 +4357,10 @@
ngx_http_core_loc_conf_t *clcf;

ngx_conf_merge_ptr_value(conf->upstream.local,
- prev->upstream.local, NULL);
+ prev->upstream.local, NULL);

ngx_conf_merge_value(conf->upstream.socket_keepalive,
- prev->upstream.socket_keepalive, 0);
+ prev->upstream.socket_keepalive, 0);

ngx_conf_merge_uint_value(conf->upstream.next_upstream_tries,
prev->upstream.next_upstream_tries, 0);
@@ -4382,14 +4382,14 @@
(size_t) ngx_pagesize);

ngx_conf_merge_bitmask_value(conf->upstream.ignore_headers,
- prev->upstream.ignore_headers,
- NGX_CONF_BITMASK_SET);
+ prev->upstream.ignore_headers,
+ NGX_CONF_BITMASK_SET);

ngx_conf_merge_bitmask_value(conf->upstream.next_upstream,
- prev->upstream.next_upstream,
- (NGX_CONF_BITMASK_SET
- |NGX_HTTP_UPSTREAM_FT_ERROR
- |NGX_HTTP_UPSTREAM_FT_TIMEOUT));
+ prev->upstream.next_upstream,
+ (NGX_CONF_BITMASK_SET
+ |NGX_HTTP_UPSTREAM_FT_ERROR
+ |NGX_HTTP_UPSTREAM_FT_TIMEOUT));

if (conf->upstream.next_upstream & NGX_HTTP_UPSTREAM_FT_OFF) {
conf->upstream.next_upstream = NGX_CONF_BITMASK_SET
@@ -4397,12 +4397,12 @@
}

ngx_conf_merge_value(conf->upstream.intercept_errors,
- prev->upstream.intercept_errors, 0);
+ prev->upstream.intercept_errors, 0);

#if (NGX_HTTP_SSL)

ngx_conf_merge_value(conf->upstream.ssl_session_reuse,
- prev->upstream.ssl_session_reuse, 1);
+ prev->upstream.ssl_session_reuse, 1);

ngx_conf_merge_bitmask_value(conf->ssl_protocols, prev->ssl_protocols,
(NGX_CONF_BITMASK_SET|NGX_SSL_TLSv1
@@ -4416,19 +4416,19 @@
}

ngx_conf_merge_value(conf->upstream.ssl_server_name,
- prev->upstream.ssl_server_name, 0);
+ prev->upstream.ssl_server_name, 0);
ngx_conf_merge_value(conf->upstream.ssl_verify,
- prev->upstream.ssl_verify, 0);
+ prev->upstream.ssl_verify, 0);
ngx_conf_merge_uint_value(conf->ssl_verify_depth,
prev->ssl_verify_depth, 1);
ngx_conf_merge_str_value(conf->ssl_trusted_certificate,
- prev->ssl_trusted_certificate, "");
+ prev->ssl_trusted_certificate, "");
ngx_conf_merge_str_value(conf->ssl_crl, prev->ssl_crl, "");

ngx_conf_merge_str_value(conf->ssl_certificate,
- prev->ssl_certificate, "");
+ prev->ssl_certificate, "");
ngx_conf_merge_str_value(conf->ssl_certificate_key,
- prev->ssl_certificate_key, "");
+ prev->ssl_certificate_key, "");
ngx_conf_merge_ptr_value(conf->ssl_passwords, prev->ssl_passwords,
NULL);

if (conf->ssl && ngx_http_grpc_set_ssl(cf, conf) != NGX_OK) {
diff -r 10678810de74 -r 3242f9829897
src/http/modules/ngx_http_gzip_filter_module.c
--- a/src/http/modules/ngx_http_gzip_filter_module.c Wed May 20 12:21:32
2020 +0800
+++ b/src/http/modules/ngx_http_gzip_filter_module.c Wed May 20 12:24:05
2020 +0800
@@ -745,10 +745,10 @@
ngx_http_gzip_conf_t *conf;

ngx_log_debug6(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
- "deflate in: ni:%p no:%p ai:%ud ao:%ud fl:%d redo:%d",
- ctx->zstream.next_in, ctx->zstream.next_out,
- ctx->zstream.avail_in, ctx->zstream.avail_out,
- ctx->flush, ctx->redo);
+ "deflate in: ni:%p no:%p ai:%ud ao:%ud fl:%d redo:%d",
+ ctx->zstream.next_in, ctx->zstream.next_out,
+ ctx->zstream.avail_in, ctx->zstream.avail_out,
+ ctx->flush, ctx->redo);

rc = deflate(&ctx->zstream, ctx->flush);

diff -r 10678810de74 -r 3242f9829897
src/http/modules/ngx_http_image_filter_module.c
--- a/src/http/modules/ngx_http_image_filter_module.c Wed May 20 12:21:32
2020 +0800
+++ b/src/http/modules/ngx_http_image_filter_module.c Wed May 20 12:24:05
2020 +0800
@@ -616,9 +616,9 @@

b->last = ngx_sprintf(b->pos,
"{ \"img\" : "
- "{ \"width\": %uz,"
- " \"height\": %uz,"
- " \"type\": \"%s\" } }" CRLF,
+ "{ \"width\": %uz,"
+ " \"height\": %uz,"
+ " \"type\": \"%s\" } }" CRLF,
ctx->width, ctx->height,
ngx_http_image_types[ctx->type - 1].data + 6);

diff -r 10678810de74 -r 3242f9829897
src/http/modules/ngx_http_memcached_module.c
--- a/src/http/modules/ngx_http_memcached_module.c Wed May 20 12:21:32 2020
+0800
+++ b/src/http/modules/ngx_http_memcached_module.c Wed May 20 12:24:05 2020
+0800
@@ -640,10 +640,10 @@
ngx_http_memcached_loc_conf_t *conf = child;

ngx_conf_merge_ptr_value(conf->upstream.local,
- prev->upstream.local, NULL);
+ prev->upstream.local, NULL);

ngx_conf_merge_value(conf->upstream.socket_keepalive,
- prev->upstream.socket_keepalive, 0);
+ prev->upstream.socket_keepalive, 0);

ngx_conf_merge_uint_value(conf->upstream.next_upstream_tries,
prev->upstream.next_upstream_tries, 0);
@@ -665,10 +665,10 @@
(size_t) ngx_pagesize);

ngx_conf_merge_bitmask_value(conf->upstream.next_upstream,
- prev->upstream.next_upstream,
- (NGX_CONF_BITMASK_SET
- |NGX_HTTP_UPSTREAM_FT_ERROR
- |NGX_HTTP_UPSTREAM_FT_TIMEOUT));
+ prev->upstream.next_upstream,
+ (NGX_CONF_BITMASK_SET
+ |NGX_HTTP_UPSTREAM_FT_ERROR
+ |NGX_HTTP_UPSTREAM_FT_TIMEOUT));

if (conf->upstream.next_upstream & NGX_HTTP_UPSTREAM_FT_OFF) {
conf->upstream.next_upstream = NGX_CONF_BITMASK_SET
diff -r 10678810de74 -r 3242f9829897
src/http/modules/ngx_http_proxy_module.c
--- a/src/http/modules/ngx_http_proxy_module.c Wed May 20 12:21:32 2020
+0800
+++ b/src/http/modules/ngx_http_proxy_module.c Wed May 20 12:24:05 2020
+0800
@@ -2934,7 +2934,7 @@

if (conf->upstream.store == NGX_CONF_UNSET) {
ngx_conf_merge_value(conf->upstream.store,
- prev->upstream.store, 0);
+ prev->upstream.store, 0);

conf->upstream.store_lengths = prev->upstream.store_lengths;
conf->upstream.store_values = prev->upstream.store_values;
@@ -2947,22 +2947,22 @@
prev->upstream.next_upstream_tries, 0);

ngx_conf_merge_value(conf->upstream.buffering,
- prev->upstream.buffering, 1);
+ prev->upstream.buffering, 1);

ngx_conf_merge_value(conf->upstream.request_buffering,
- prev->upstream.request_buffering, 1);
+ prev->upstream.request_buffering, 1);

ngx_conf_merge_value(conf->upstream.ignore_client_abort,
- prev->upstream.ignore_client_abort, 0);
+ prev->upstream.ignore_client_abort, 0);

ngx_conf_merge_value(conf->upstream.force_ranges,
- prev->upstream.force_ranges, 0);
+ prev->upstream.force_ranges, 0);

ngx_conf_merge_ptr_value(conf->upstream.local,
- prev->upstream.local, NULL);
+ prev->upstream.local, NULL);

ngx_conf_merge_value(conf->upstream.socket_keepalive,
- prev->upstream.socket_keepalive, 0);
+ prev->upstream.socket_keepalive, 0);

ngx_conf_merge_msec_value(conf->upstream.connect_timeout,
prev->upstream.connect_timeout, 60000);
@@ -3078,15 +3078,15 @@


ngx_conf_merge_bitmask_value(conf->upstream.ignore_headers,
- prev->upstream.ignore_headers,
- NGX_CONF_BITMASK_SET);
+ prev->upstream.ignore_headers,
+ NGX_CONF_BITMASK_SET);


ngx_conf_merge_bitmask_value(conf->upstream.next_upstream,
- prev->upstream.next_upstream,
- (NGX_CONF_BITMASK_SET
- |NGX_HTTP_UPSTREAM_FT_ERROR
- |NGX_HTTP_UPSTREAM_FT_TIMEOUT));
+ prev->upstream.next_upstream,
+ (NGX_CONF_BITMASK_SET
+ |NGX_HTTP_UPSTREAM_FT_ERROR
+ |NGX_HTTP_UPSTREAM_FT_TIMEOUT));

if (conf->upstream.next_upstream & NGX_HTTP_UPSTREAM_FT_OFF) {
conf->upstream.next_upstream = NGX_CONF_BITMASK_SET
@@ -3106,7 +3106,7 @@

if (conf->upstream.cache == NGX_CONF_UNSET) {
ngx_conf_merge_value(conf->upstream.cache,
- prev->upstream.cache, 0);
+ prev->upstream.cache, 0);

conf->upstream.cache_zone = prev->upstream.cache_zone;
conf->upstream.cache_value = prev->upstream.cache_value;
@@ -3128,13 +3128,13 @@
prev->upstream.cache_min_uses, 1);

ngx_conf_merge_off_value(conf->upstream.cache_max_range_offset,
- prev->upstream.cache_max_range_offset,
- NGX_MAX_OFF_T_VALUE);
+ prev->upstream.cache_max_range_offset,
+ NGX_MAX_OFF_T_VALUE);

ngx_conf_merge_bitmask_value(conf->upstream.cache_use_stale,
- prev->upstream.cache_use_stale,
- (NGX_CONF_BITMASK_SET
- |NGX_HTTP_UPSTREAM_FT_OFF));
+ prev->upstream.cache_use_stale,
+ (NGX_CONF_BITMASK_SET
+ |NGX_HTTP_UPSTREAM_FT_OFF));

if (conf->upstream.cache_use_stale & NGX_HTTP_UPSTREAM_FT_OFF) {
conf->upstream.cache_use_stale = NGX_CONF_BITMASK_SET
@@ -3165,7 +3165,7 @@
}

ngx_conf_merge_value(conf->upstream.cache_lock,
- prev->upstream.cache_lock, 0);
+ prev->upstream.cache_lock, 0);

ngx_conf_merge_msec_value(conf->upstream.cache_lock_timeout,
prev->upstream.cache_lock_timeout, 5000);
@@ -3174,13 +3174,13 @@
prev->upstream.cache_lock_age, 5000);

ngx_conf_merge_value(conf->upstream.cache_revalidate,
- prev->upstream.cache_revalidate, 0);
+ prev->upstream.cache_revalidate, 0);

ngx_conf_merge_value(conf->upstream.cache_convert_head,
- prev->upstream.cache_convert_head, 1);
+ prev->upstream.cache_convert_head, 1);

ngx_conf_merge_value(conf->upstream.cache_background_update,
- prev->upstream.cache_background_update, 0);
+ prev->upstream.cache_background_update, 0);

#endif

@@ -3189,17 +3189,17 @@
}

ngx_conf_merge_value(conf->upstream.pass_request_headers,
- prev->upstream.pass_request_headers, 1);
+ prev->upstream.pass_request_headers, 1);
ngx_conf_merge_value(conf->upstream.pass_request_body,
- prev->upstream.pass_request_body, 1);
+ prev->upstream.pass_request_body, 1);

ngx_conf_merge_value(conf->upstream.intercept_errors,
- prev->upstream.intercept_errors, 0);
+ prev->upstream.intercept_errors, 0);

#if (NGX_HTTP_SSL)

ngx_conf_merge_value(conf->upstream.ssl_session_reuse,
- prev->upstream.ssl_session_reuse, 1);
+ prev->upstream.ssl_session_reuse, 1);

ngx_conf_merge_bitmask_value(conf->ssl_protocols, prev->ssl_protocols,
(NGX_CONF_BITMASK_SET|NGX_SSL_TLSv1
@@ -3213,19 +3213,19 @@
}

ngx_conf_merge_value(conf->upstream.ssl_server_name,
- prev->upstream.ssl_server_name, 0);
+ prev->upstream.ssl_server_name, 0);
ngx_conf_merge_value(conf->upstream.ssl_verify,
- prev->upstream.ssl_verify, 0);
+ prev->upstream.ssl_verify, 0);
ngx_conf_merge_uint_value(conf->ssl_verify_depth,
prev->ssl_verify_depth, 1);
ngx_conf_merge_str_value(conf->ssl_trusted_certificate,
- prev->ssl_trusted_certificate, "");
+ prev->ssl_trusted_certificate, "");
ngx_conf_merge_str_value(conf->ssl_crl, prev->ssl_crl, "");

ngx_conf_merge_str_value(conf->ssl_certificate,
- prev->ssl_certificate, "");
+ prev->ssl_certificate, "");
ngx_conf_merge_str_value(conf->ssl_certificate_key,
- prev->ssl_certificate_key, "");
+ prev->ssl_certificate_key, "");
ngx_conf_merge_ptr_value(conf->ssl_passwords, prev->ssl_passwords,
NULL);

if (conf->ssl && ngx_http_proxy_set_ssl(cf, conf) != NGX_OK) {
@@ -3954,7 +3954,7 @@

if (plcf->cookie_paths == NGX_CONF_UNSET_PTR) {
plcf->cookie_paths = ngx_array_create(cf->pool, 1,
- sizeof(ngx_http_proxy_rewrite_t));
+
sizeof(ngx_http_proxy_rewrite_t));
if (plcf->cookie_paths == NULL) {
return NGX_CONF_ERROR;
}
diff -r 10678810de74 -r 3242f9829897
src/http/modules/ngx_http_range_filter_module.c
--- a/src/http/modules/ngx_http_range_filter_module.c Wed May 20 12:21:32
2020 +0800
+++ b/src/http/modules/ngx_http_range_filter_module.c Wed May 20 12:24:05
2020 +0800
@@ -509,18 +509,18 @@

} else if (r->headers_out.content_type.len) {
ctx->boundary_header.len = ngx_sprintf(ctx->boundary_header.data,
- CRLF "--%0muA" CRLF
- "Content-Type: %V" CRLF
- "Content-Range: bytes ",
- boundary,
- &r->headers_out.content_type)
+ CRLF "--%0muA" CRLF
+ "Content-Type: %V" CRLF
+ "Content-Range: bytes ",
+ boundary,
+
&r->headers_out.content_type)
- ctx->boundary_header.data;

} else {
ctx->boundary_header.len = ngx_sprintf(ctx->boundary_header.data,
- CRLF "--%0muA" CRLF
- "Content-Range: bytes ",
- boundary)
+ CRLF "--%0muA" CRLF
+ "Content-Range: bytes ",
+ boundary)
- ctx->boundary_header.data;
}

diff -r 10678810de74 -r 3242f9829897
src/http/modules/ngx_http_rewrite_module.c
--- a/src/http/modules/ngx_http_rewrite_module.c Wed May 20 12:21:32 2020
+0800
+++ b/src/http/modules/ngx_http_rewrite_module.c Wed May 20 12:24:05 2020
+0800
@@ -802,7 +802,7 @@
}

fop = ngx_http_script_start_code(cf->pool, &lcf->codes,
-
sizeof(ngx_http_script_file_code_t));
+
sizeof(ngx_http_script_file_code_t));
if (fop == NULL) {
return NGX_CONF_ERROR;
}
diff -r 10678810de74 -r 3242f9829897 src/http/modules/ngx_http_scgi_module.c
--- a/src/http/modules/ngx_http_scgi_module.c Wed May 20 12:21:32 2020 +0800
+++ b/src/http/modules/ngx_http_scgi_module.c Wed May 20 12:24:05 2020 +0800
@@ -1292,22 +1292,22 @@
prev->upstream.next_upstream_tries, 0);

ngx_conf_merge_value(conf->upstream.buffering,
- prev->upstream.buffering, 1);
+ prev->upstream.buffering, 1);

ngx_conf_merge_value(conf->upstream.request_buffering,
- prev->upstream.request_buffering, 1);
+ prev->upstream.request_buffering, 1);

ngx_conf_merge_value(conf->upstream.ignore_client_abort,
- prev->upstream.ignore_client_abort, 0);
+ prev->upstream.ignore_client_abort, 0);

ngx_conf_merge_value(conf->upstream.force_ranges,
- prev->upstream.force_ranges, 0);
+ prev->upstream.force_ranges, 0);

ngx_conf_merge_ptr_value(conf->upstream.local,
- prev->upstream.local, NULL);
+ prev->upstream.local, NULL);

ngx_conf_merge_value(conf->upstream.socket_keepalive,
- prev->upstream.socket_keepalive, 0);
+ prev->upstream.socket_keepalive, 0);

ngx_conf_merge_msec_value(conf->upstream.connect_timeout,
prev->upstream.connect_timeout, 60000);
@@ -1372,8 +1372,8 @@
> (conf->upstream.bufs.num - 1) * conf->upstream.bufs.size)
{
ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
- "\"scgi_busy_buffers_size\" must be less than "
- "the size of all \"scgi_buffers\" minus one buffer");
+ "\"scgi_busy_buffers_size\" must be less than "
+ "the size of all \"scgi_buffers\" minus one
buffer");

return NGX_CONF_ERROR;
}
@@ -1452,7 +1452,7 @@

if (conf->upstream.cache == NGX_CONF_UNSET) {
ngx_conf_merge_value(conf->upstream.cache,
- prev->upstream.cache, 0);
+ prev->upstream.cache, 0);

conf->upstream.cache_zone = prev->upstream.cache_zone;
conf->upstream.cache_value = prev->upstream.cache_value;
@@ -1474,13 +1474,13 @@
prev->upstream.cache_min_uses, 1);

ngx_conf_merge_off_value(conf->upstream.cache_max_range_offset,
- prev->upstream.cache_max_range_offset,
- NGX_MAX_OFF_T_VALUE);
+ prev->upstream.cache_max_range_offset,
+ NGX_MAX_OFF_T_VALUE);

ngx_conf_merge_bitmask_value(conf->upstream.cache_use_stale,
- prev->upstream.cache_use_stale,
- (NGX_CONF_BITMASK_SET
- |NGX_HTTP_UPSTREAM_FT_OFF));
+ prev->upstream.cache_use_stale,
+ (NGX_CONF_BITMASK_SET
+ |NGX_HTTP_UPSTREAM_FT_OFF));

if (conf->upstream.cache_use_stale & NGX_HTTP_UPSTREAM_FT_OFF) {
conf->upstream.cache_use_stale = NGX_CONF_BITMASK_SET
@@ -1516,7 +1516,7 @@
}

ngx_conf_merge_value(conf->upstream.cache_lock,
- prev->upstream.cache_lock, 0);
+ prev->upstream.cache_lock, 0);

ngx_conf_merge_msec_value(conf->upstream.cache_lock_timeout,
prev->upstream.cache_lock_timeout, 5000);
@@ -1525,10 +1525,10 @@
prev->upstream.cache_lock_age, 5000);

ngx_conf_merge_value(conf->upstream.cache_revalidate,
- prev->upstream.cache_revalidate, 0);
+ prev->upstream.cache_revalidate, 0);

ngx_conf_merge_value(conf->upstream.cache_background_update,
- prev->upstream.cache_background_update, 0);
+ prev->upstream.cache_background_update, 0);

#endif

diff -r 10678810de74 -r 3242f9829897 src/http/modules/ngx_http_ssl_module.c
--- a/src/http/modules/ngx_http_ssl_module.c Wed May 20 12:21:32 2020 +0800
+++ b/src/http/modules/ngx_http_ssl_module.c Wed May 20 12:24:05 2020 +0800
@@ -613,31 +613,31 @@
ngx_conf_merge_value(conf->early_data, prev->early_data, 0);

ngx_conf_merge_bitmask_value(conf->protocols, prev->protocols,
- (NGX_CONF_BITMASK_SET|NGX_SSL_TLSv1
- |NGX_SSL_TLSv1_1|NGX_SSL_TLSv1_2));
+ (NGX_CONF_BITMASK_SET|NGX_SSL_TLSv1
+ |NGX_SSL_TLSv1_1|NGX_SSL_TLSv1_2));

ngx_conf_merge_size_value(conf->buffer_size, prev->buffer_size,
- NGX_SSL_BUFSIZE);
+ NGX_SSL_BUFSIZE);

ngx_conf_merge_uint_value(conf->verify, prev->verify, 0);
ngx_conf_merge_uint_value(conf->verify_depth, prev->verify_depth, 1);

ngx_conf_merge_ptr_value(conf->certificates, prev->certificates, NULL);
ngx_conf_merge_ptr_value(conf->certificate_keys,
prev->certificate_keys,
- NULL);
+ NULL);

ngx_conf_merge_ptr_value(conf->passwords, prev->passwords, NULL);

ngx_conf_merge_str_value(conf->dhparam, prev->dhparam, "");

ngx_conf_merge_str_value(conf->client_certificate,
prev->client_certificate,
- "");
+ "");
ngx_conf_merge_str_value(conf->trusted_certificate,
- prev->trusted_certificate, "");
+ prev->trusted_certificate, "");
ngx_conf_merge_str_value(conf->crl, prev->crl, "");

ngx_conf_merge_str_value(conf->ecdh_curve, prev->ecdh_curve,
- NGX_DEFAULT_ECDH_CURVE);
+ NGX_DEFAULT_ECDH_CURVE);

ngx_conf_merge_str_value(conf->ciphers, prev->ciphers,
NGX_DEFAULT_CIPHERS);

@@ -645,7 +645,7 @@
ngx_conf_merge_value(conf->stapling_verify, prev->stapling_verify, 0);
ngx_conf_merge_str_value(conf->stapling_file, prev->stapling_file, "");
ngx_conf_merge_str_value(conf->stapling_responder,
- prev->stapling_responder, "");
+ prev->stapling_responder, "");

conf->ssl.log = cf->log;

@@ -834,7 +834,7 @@
#endif

ngx_conf_merge_ptr_value(conf->session_ticket_keys,
- prev->session_ticket_keys, NULL);
+ prev->session_ticket_keys, NULL);

if (ngx_ssl_session_ticket_keys(cf, &conf->ssl,
conf->session_ticket_keys)
!= NGX_OK)
diff -r 10678810de74 -r 3242f9829897
src/http/modules/ngx_http_uwsgi_module.c
--- a/src/http/modules/ngx_http_uwsgi_module.c Wed May 20 12:21:32 2020
+0800
+++ b/src/http/modules/ngx_http_uwsgi_module.c Wed May 20 12:24:05 2020
+0800
@@ -1513,22 +1513,22 @@
prev->upstream.next_upstream_tries, 0);

ngx_conf_merge_value(conf->upstream.buffering,
- prev->upstream.buffering, 1);
+ prev->upstream.buffering, 1);

ngx_conf_merge_value(conf->upstream.request_buffering,
- prev->upstream.request_buffering, 1);
+ prev->upstream.request_buffering, 1);

ngx_conf_merge_value(conf->upstream.ignore_client_abort,
- prev->upstream.ignore_client_abort, 0);
+ prev->upstream.ignore_client_abort, 0);

ngx_conf_merge_value(conf->upstream.force_ranges,
- prev->upstream.force_ranges, 0);
+ prev->upstream.force_ranges, 0);

ngx_conf_merge_ptr_value(conf->upstream.local,
- prev->upstream.local, NULL);
+ prev->upstream.local, NULL);

ngx_conf_merge_value(conf->upstream.socket_keepalive,
- prev->upstream.socket_keepalive, 0);
+ prev->upstream.socket_keepalive, 0);

ngx_conf_merge_msec_value(conf->upstream.connect_timeout,
prev->upstream.connect_timeout, 60000);
@@ -1673,7 +1673,7 @@

if (conf->upstream.cache == NGX_CONF_UNSET) {
ngx_conf_merge_value(conf->upstream.cache,
- prev->upstream.cache, 0);
+ prev->upstream.cache, 0);

conf->upstream.cache_zone = prev->upstream.cache_zone;
conf->upstream.cache_value = prev->upstream.cache_value;
@@ -1695,12 +1695,12 @@
prev->upstream.cache_min_uses, 1);

ngx_conf_merge_off_value(conf->upstream.cache_max_range_offset,
- prev->upstream.cache_max_range_offset,
- NGX_MAX_OFF_T_VALUE);
+ prev->upstream.cache_max_range_offset,
+ NGX_MAX_OFF_T_VALUE);

ngx_conf_merge_bitmask_value(conf->upstream.cache_use_stale,
- prev->upstream.cache_use_stale,
- (NGX_CONF_BITMASK_SET
+ prev->upstream.cache_use_stale,
+ (NGX_CONF_BITMASK_SET
|NGX_HTTP_UPSTREAM_FT_OFF));

if (conf->upstream.cache_use_stale & NGX_HTTP_UPSTREAM_FT_OFF) {
@@ -1737,7 +1737,7 @@
}

ngx_conf_merge_value(conf->upstream.cache_lock,
- prev->upstream.cache_lock, 0);
+ prev->upstream.cache_lock, 0);

ngx_conf_merge_msec_value(conf->upstream.cache_lock_timeout,
prev->upstream.cache_lock_timeout, 5000);
@@ -1746,10 +1746,10 @@
prev->upstream.cache_lock_age, 5000);

ngx_conf_merge_value(conf->upstream.cache_revalidate,
- prev->upstream.cache_revalidate, 0);
+ prev->upstream.cache_revalidate, 0);

ngx_conf_merge_value(conf->upstream.cache_background_update,
- prev->upstream.cache_background_update, 0);
+ prev->upstream.cache_background_update, 0);

#endif

@@ -1764,7 +1764,7 @@
#if (NGX_HTTP_SSL)

ngx_conf_merge_value(conf->upstream.ssl_session_reuse,
- prev->upstream.ssl_session_reuse, 1);
+ prev->upstream.ssl_session_reuse, 1);

ngx_conf_merge_bitmask_value(conf->ssl_protocols, prev->ssl_protocols,
(NGX_CONF_BITMASK_SET|NGX_SSL_TLSv1
@@ -1778,19 +1778,19 @@
}

ngx_conf_merge_value(conf->upstream.ssl_server_name,
- prev->upstream.ssl_server_name, 0);
+ prev->upstream.ssl_server_name, 0);
ngx_conf_merge_value(conf->upstream.ssl_verify,
- prev->upstream.ssl_verify, 0);
+ prev->upstream.ssl_verify, 0);
ngx_conf_merge_uint_value(conf->ssl_verify_depth,
prev->ssl_verify_depth, 1);
ngx_conf_merge_str_value(conf->ssl_trusted_certificate,
- prev->ssl_trusted_certificate, "");
+ prev->ssl_trusted_certificate, "");
ngx_conf_merge_str_value(conf->ssl_crl, prev->ssl_crl, "");

ngx_conf_merge_str_value(conf->ssl_certificate,
- prev->ssl_certificate, "");
+ prev->ssl_certificate, "");
ngx_conf_merge_str_value(conf->ssl_certificate_key,
- prev->ssl_certificate_key, "");
+ prev->ssl_certificate_key, "");
ngx_conf_merge_ptr_value(conf->ssl_passwords, prev->ssl_passwords,
NULL);

if (conf->ssl && ngx_http_uwsgi_set_ssl(cf, conf) != NGX_OK) {
diff -r 10678810de74 -r 3242f9829897
src/http/modules/ngx_http_xslt_filter_module.c
--- a/src/http/modules/ngx_http_xslt_filter_module.c Wed May 20 12:21:32
2020 +0800
+++ b/src/http/modules/ngx_http_xslt_filter_module.c Wed May 20 12:24:05
2020 +0800
@@ -318,7 +318,7 @@

if (b == NULL) {
return ngx_http_filter_finalize_request(r,
&ngx_http_xslt_filter_module,
-
NGX_HTTP_INTERNAL_SERVER_ERROR);
+
NGX_HTTP_INTERNAL_SERVER_ERROR);
}

cln = ngx_pool_cleanup_add(r->pool, 0);
@@ -326,7 +326,7 @@
if (cln == NULL) {
ngx_free(b->pos);
return ngx_http_filter_finalize_request(r,
&ngx_http_xslt_filter_module,
-
NGX_HTTP_INTERNAL_SERVER_ERROR);
+
NGX_HTTP_INTERNAL_SERVER_ERROR);
}

if (r == r->main) {
@@ -704,7 +704,7 @@
p = (u_char *) ngx_strchr(p, '=');
if (p == NULL) {
ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
- "invalid libxslt parameter \"%s\"", value);
+ "invalid libxslt parameter \"%s\"", value);
return NGX_ERROR;
}
*p++ = '\0';


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