<div dir="ltr">Hello!<br><div><br></div><div>Nginx is famous for code readability and neat code format. I use the tool(<a href="https://github.com/openresty/openresty-devel-utils" target="_blank">https://github.com/openresty/openresty-devel-utils</a>) to try to unify the incorrect front spaces, Here is my attempt at http/modules.</div><div><br></div><div># HG changeset patch<br># User Jinhua Tan <<a href="mailto:312841925@qq.com">312841925@qq.com</a>><br># Date 1589948645 -28800<br>#      Wed May 20 12:24:05 2020 +0800<br># Node ID 3242f98298975e556a7e87130611ce84799fe935<br># Parent  10678810de74edc4c02d5cd7303f0099eee9fac3<br>Style(http/modules): fix the incorrect front spaces to unite style.<br><br>diff -r 10678810de74 -r 3242f9829897 src/http/modules/ngx_http_access_module.c<br>--- a/src/http/modules/ngx_http_access_module.c     Wed May 20 12:21:32 2020 +0800<br>+++ b/src/http/modules/ngx_http_access_module.c Wed May 20 12:24:05 2020 +0800<br>@@ -327,7 +327,7 @@<br> <br>         if (rc == NGX_ERROR) {<br>             ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,<br>-                         "invalid parameter \"%V\"", &value[1]);<br>+                               "invalid parameter \"%V\"", &value[1]);<br>             return NGX_CONF_ERROR;<br>         }<br> <br>diff -r 10678810de74 -r 3242f9829897 src/http/modules/ngx_http_dav_module.c<br>--- a/src/http/modules/ngx_http_dav_module.c  Wed May 20 12:21:32 2020 +0800<br>+++ b/src/http/modules/ngx_http_dav_module.c    Wed May 20 12:24:05 2020 +0800<br>@@ -1116,10 +1116,10 @@<br>     ngx_http_dav_loc_conf_t  *conf = child;<br> <br>     ngx_conf_merge_bitmask_value(conf->methods, prev->methods,<br>-                         (NGX_CONF_BITMASK_SET|NGX_HTTP_DAV_OFF));<br>+                                 (NGX_CONF_BITMASK_SET|NGX_HTTP_DAV_OFF));<br> <br>     ngx_conf_merge_uint_value(conf->min_delete_depth,<br>-                         prev->min_delete_depth, 0);<br>+                              prev->min_delete_depth, 0);<br> <br>     ngx_conf_merge_uint_value(conf->access, prev->access, 0600);<br> <br>diff -r 10678810de74 -r 3242f9829897 src/http/modules/ngx_http_fastcgi_module.c<br>--- a/src/http/modules/ngx_http_fastcgi_module.c      Wed May 20 12:21:32 2020 +0800<br>+++ b/src/http/modules/ngx_http_fastcgi_module.c        Wed May 20 12:24:05 2020 +0800<br>@@ -2805,7 +2805,7 @@<br> <br>     if (conf->upstream.store == NGX_CONF_UNSET) {<br>         ngx_conf_merge_value(conf->upstream.store,<br>-                              prev->upstream.store, 0);<br>+                             prev->upstream.store, 0);<br> <br>         conf->upstream.store_lengths = prev->upstream.store_lengths;<br>         conf->upstream.store_values = prev->upstream.store_values;<br>@@ -2818,22 +2818,22 @@<br>                               prev->upstream.next_upstream_tries, 0);<br> <br>     ngx_conf_merge_value(conf->upstream.buffering,<br>-                              prev->upstream.buffering, 1);<br>+                         prev->upstream.buffering, 1);<br> <br>     ngx_conf_merge_value(conf->upstream.request_buffering,<br>-                              prev->upstream.request_buffering, 1);<br>+                         prev->upstream.request_buffering, 1);<br> <br>     ngx_conf_merge_value(conf->upstream.ignore_client_abort,<br>-                              prev->upstream.ignore_client_abort, 0);<br>+                         prev->upstream.ignore_client_abort, 0);<br> <br>     ngx_conf_merge_value(conf->upstream.force_ranges,<br>-                              prev->upstream.force_ranges, 0);<br>+                         prev->upstream.force_ranges, 0);<br> <br>     ngx_conf_merge_ptr_value(conf->upstream.local,<br>-                              prev->upstream.local, NULL);<br>+                             prev->upstream.local, NULL);<br> <br>     ngx_conf_merge_value(conf->upstream.socket_keepalive,<br>-                              prev->upstream.socket_keepalive, 0);<br>+                         prev->upstream.socket_keepalive, 0);<br> <br>     ngx_conf_merge_msec_value(conf->upstream.connect_timeout,<br>                               prev->upstream.connect_timeout, 60000);<br>@@ -2951,15 +2951,15 @@<br> <br> <br>     ngx_conf_merge_bitmask_value(conf->upstream.ignore_headers,<br>-                              prev->upstream.ignore_headers,<br>-                              NGX_CONF_BITMASK_SET);<br>+                                 prev->upstream.ignore_headers,<br>+                                 NGX_CONF_BITMASK_SET);<br> <br> <br>     ngx_conf_merge_bitmask_value(conf->upstream.next_upstream,<br>-                              prev->upstream.next_upstream,<br>-                              (NGX_CONF_BITMASK_SET<br>-                               |NGX_HTTP_UPSTREAM_FT_ERROR<br>-                               |NGX_HTTP_UPSTREAM_FT_TIMEOUT));<br>+                                 prev->upstream.next_upstream,<br>+                                 (NGX_CONF_BITMASK_SET<br>+                                  |NGX_HTTP_UPSTREAM_FT_ERROR<br>+                                  |NGX_HTTP_UPSTREAM_FT_TIMEOUT));<br> <br>     if (conf->upstream.next_upstream & NGX_HTTP_UPSTREAM_FT_OFF) {<br>         conf->upstream.next_upstream = NGX_CONF_BITMASK_SET<br>@@ -2978,7 +2978,7 @@<br> <br>     if (conf->upstream.cache == NGX_CONF_UNSET) {<br>         ngx_conf_merge_value(conf->upstream.cache,<br>-                              prev->upstream.cache, 0);<br>+                             prev->upstream.cache, 0);<br> <br>         conf->upstream.cache_zone = prev->upstream.cache_zone;<br>         conf->upstream.cache_value = prev->upstream.cache_value;<br>@@ -3000,13 +3000,13 @@<br>                               prev->upstream.cache_min_uses, 1);<br> <br>     ngx_conf_merge_off_value(conf->upstream.cache_max_range_offset,<br>-                              prev->upstream.cache_max_range_offset,<br>-                              NGX_MAX_OFF_T_VALUE);<br>+                             prev->upstream.cache_max_range_offset,<br>+                             NGX_MAX_OFF_T_VALUE);<br> <br>     ngx_conf_merge_bitmask_value(conf->upstream.cache_use_stale,<br>-                              prev->upstream.cache_use_stale,<br>-                              (NGX_CONF_BITMASK_SET<br>-                               |NGX_HTTP_UPSTREAM_FT_OFF));<br>+                                 prev->upstream.cache_use_stale,<br>+                                 (NGX_CONF_BITMASK_SET<br>+                                  |NGX_HTTP_UPSTREAM_FT_OFF));<br> <br>     if (conf->upstream.cache_use_stale & NGX_HTTP_UPSTREAM_FT_OFF) {<br>         conf->upstream.cache_use_stale = NGX_CONF_BITMASK_SET<br>@@ -3042,7 +3042,7 @@<br>     }<br> <br>     ngx_conf_merge_value(conf->upstream.cache_lock,<br>-                              prev->upstream.cache_lock, 0);<br>+                         prev->upstream.cache_lock, 0);<br> <br>     ngx_conf_merge_msec_value(conf->upstream.cache_lock_timeout,<br>                               prev->upstream.cache_lock_timeout, 5000);<br>@@ -3051,20 +3051,20 @@<br>                               prev->upstream.cache_lock_age, 5000);<br> <br>     ngx_conf_merge_value(conf->upstream.cache_revalidate,<br>-                              prev->upstream.cache_revalidate, 0);<br>+                         prev->upstream.cache_revalidate, 0);<br> <br>     ngx_conf_merge_value(conf->upstream.cache_background_update,<br>-                              prev->upstream.cache_background_update, 0);<br>+                         prev->upstream.cache_background_update, 0);<br> <br> #endif<br> <br>     ngx_conf_merge_value(conf->upstream.pass_request_headers,<br>-                              prev->upstream.pass_request_headers, 1);<br>+                         prev->upstream.pass_request_headers, 1);<br>     ngx_conf_merge_value(conf->upstream.pass_request_body,<br>-                              prev->upstream.pass_request_body, 1);<br>+                         prev->upstream.pass_request_body, 1);<br> <br>     ngx_conf_merge_value(conf->upstream.intercept_errors,<br>-                              prev->upstream.intercept_errors, 0);<br>+                         prev->upstream.intercept_errors, 0);<br> <br>     ngx_conf_merge_ptr_value(conf->catch_stderr, prev->catch_stderr, NULL);<br> <br>diff -r 10678810de74 -r 3242f9829897 src/http/modules/ngx_http_grpc_module.c<br>--- a/src/http/modules/ngx_http_grpc_module.c  Wed May 20 12:21:32 2020 +0800<br>+++ b/src/http/modules/ngx_http_grpc_module.c   Wed May 20 12:24:05 2020 +0800<br>@@ -4357,10 +4357,10 @@<br>     ngx_http_core_loc_conf_t  *clcf;<br> <br>     ngx_conf_merge_ptr_value(conf->upstream.local,<br>-                              prev->upstream.local, NULL);<br>+                             prev->upstream.local, NULL);<br> <br>     ngx_conf_merge_value(conf->upstream.socket_keepalive,<br>-                              prev->upstream.socket_keepalive, 0);<br>+                         prev->upstream.socket_keepalive, 0);<br> <br>     ngx_conf_merge_uint_value(conf->upstream.next_upstream_tries,<br>                               prev->upstream.next_upstream_tries, 0);<br>@@ -4382,14 +4382,14 @@<br>                               (size_t) ngx_pagesize);<br> <br>     ngx_conf_merge_bitmask_value(conf->upstream.ignore_headers,<br>-                              prev->upstream.ignore_headers,<br>-                              NGX_CONF_BITMASK_SET);<br>+                                 prev->upstream.ignore_headers,<br>+                                 NGX_CONF_BITMASK_SET);<br> <br>     ngx_conf_merge_bitmask_value(conf->upstream.next_upstream,<br>-                              prev->upstream.next_upstream,<br>-                              (NGX_CONF_BITMASK_SET<br>-                               |NGX_HTTP_UPSTREAM_FT_ERROR<br>-                               |NGX_HTTP_UPSTREAM_FT_TIMEOUT));<br>+                                 prev->upstream.next_upstream,<br>+                                 (NGX_CONF_BITMASK_SET<br>+                                  |NGX_HTTP_UPSTREAM_FT_ERROR<br>+                                  |NGX_HTTP_UPSTREAM_FT_TIMEOUT));<br> <br>     if (conf->upstream.next_upstream & NGX_HTTP_UPSTREAM_FT_OFF) {<br>         conf->upstream.next_upstream = NGX_CONF_BITMASK_SET<br>@@ -4397,12 +4397,12 @@<br>     }<br> <br>     ngx_conf_merge_value(conf->upstream.intercept_errors,<br>-                              prev->upstream.intercept_errors, 0);<br>+                         prev->upstream.intercept_errors, 0);<br> <br> #if (NGX_HTTP_SSL)<br> <br>     ngx_conf_merge_value(conf->upstream.ssl_session_reuse,<br>-                              prev->upstream.ssl_session_reuse, 1);<br>+                         prev->upstream.ssl_session_reuse, 1);<br> <br>     ngx_conf_merge_bitmask_value(conf->ssl_protocols, prev->ssl_protocols,<br>                                  (NGX_CONF_BITMASK_SET|NGX_SSL_TLSv1<br>@@ -4416,19 +4416,19 @@<br>     }<br> <br>     ngx_conf_merge_value(conf->upstream.ssl_server_name,<br>-                              prev->upstream.ssl_server_name, 0);<br>+                         prev->upstream.ssl_server_name, 0);<br>     ngx_conf_merge_value(conf->upstream.ssl_verify,<br>-                              prev->upstream.ssl_verify, 0);<br>+                         prev->upstream.ssl_verify, 0);<br>     ngx_conf_merge_uint_value(conf->ssl_verify_depth,<br>                               prev->ssl_verify_depth, 1);<br>     ngx_conf_merge_str_value(conf->ssl_trusted_certificate,<br>-                              prev->ssl_trusted_certificate, "");<br>+                             prev->ssl_trusted_certificate, "");<br>     ngx_conf_merge_str_value(conf->ssl_crl, prev->ssl_crl, "");<br> <br>     ngx_conf_merge_str_value(conf->ssl_certificate,<br>-                              prev->ssl_certificate, "");<br>+                             prev->ssl_certificate, "");<br>     ngx_conf_merge_str_value(conf->ssl_certificate_key,<br>-                              prev->ssl_certificate_key, "");<br>+                             prev->ssl_certificate_key, "");<br>     ngx_conf_merge_ptr_value(conf->ssl_passwords, prev->ssl_passwords, NULL);<br> <br>     if (conf->ssl && ngx_http_grpc_set_ssl(cf, conf) != NGX_OK) {<br>diff -r 10678810de74 -r 3242f9829897 src/http/modules/ngx_http_gzip_filter_module.c<br>--- a/src/http/modules/ngx_http_gzip_filter_module.c Wed May 20 12:21:32 2020 +0800<br>+++ b/src/http/modules/ngx_http_gzip_filter_module.c    Wed May 20 12:24:05 2020 +0800<br>@@ -745,10 +745,10 @@<br>     ngx_http_gzip_conf_t  *conf;<br> <br>     ngx_log_debug6(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,<br>-                 "deflate in: ni:%p no:%p ai:%ud ao:%ud fl:%d redo:%d",<br>-                 ctx->zstream.next_in, ctx->zstream.next_out,<br>-                 ctx->zstream.avail_in, ctx->zstream.avail_out,<br>-                 ctx->flush, ctx->redo);<br>+                   "deflate in: ni:%p no:%p ai:%ud ao:%ud fl:%d redo:%d",<br>+                   ctx->zstream.next_in, ctx->zstream.next_out,<br>+                   ctx->zstream.avail_in, ctx->zstream.avail_out,<br>+                   ctx->flush, ctx->redo);<br> <br>     rc = deflate(&ctx->zstream, ctx->flush);<br> <br>diff -r 10678810de74 -r 3242f9829897 src/http/modules/ngx_http_image_filter_module.c<br>--- a/src/http/modules/ngx_http_image_filter_module.c    Wed May 20 12:21:32 2020 +0800<br>+++ b/src/http/modules/ngx_http_image_filter_module.c   Wed May 20 12:24:05 2020 +0800<br>@@ -616,9 +616,9 @@<br> <br>     b->last = ngx_sprintf(b->pos,<br>                           "{ \"img\" : "<br>-                                       "{ \"width\": %uz,"<br>-                                        " \"height\": %uz,"<br>-                                        " \"type\": \"%s\" } }" CRLF,<br>+                          "{ \"width\": %uz,"<br>+                          " \"height\": %uz,"<br>+                          " \"type\": \"%s\" } }" CRLF,<br>                           ctx->width, ctx->height,<br>                           ngx_http_image_types[ctx->type - 1].data + 6);<br> <br>diff -r 10678810de74 -r 3242f9829897 src/http/modules/ngx_http_memcached_module.c<br>--- a/src/http/modules/ngx_http_memcached_module.c    Wed May 20 12:21:32 2020 +0800<br>+++ b/src/http/modules/ngx_http_memcached_module.c      Wed May 20 12:24:05 2020 +0800<br>@@ -640,10 +640,10 @@<br>     ngx_http_memcached_loc_conf_t *conf = child;<br> <br>     ngx_conf_merge_ptr_value(conf->upstream.local,<br>-                              prev->upstream.local, NULL);<br>+                             prev->upstream.local, NULL);<br> <br>     ngx_conf_merge_value(conf->upstream.socket_keepalive,<br>-                              prev->upstream.socket_keepalive, 0);<br>+                         prev->upstream.socket_keepalive, 0);<br> <br>     ngx_conf_merge_uint_value(conf->upstream.next_upstream_tries,<br>                               prev->upstream.next_upstream_tries, 0);<br>@@ -665,10 +665,10 @@<br>                               (size_t) ngx_pagesize);<br> <br>     ngx_conf_merge_bitmask_value(conf->upstream.next_upstream,<br>-                              prev->upstream.next_upstream,<br>-                              (NGX_CONF_BITMASK_SET<br>-                               |NGX_HTTP_UPSTREAM_FT_ERROR<br>-                               |NGX_HTTP_UPSTREAM_FT_TIMEOUT));<br>+                                 prev->upstream.next_upstream,<br>+                                 (NGX_CONF_BITMASK_SET<br>+                                  |NGX_HTTP_UPSTREAM_FT_ERROR<br>+                                  |NGX_HTTP_UPSTREAM_FT_TIMEOUT));<br> <br>     if (conf->upstream.next_upstream & NGX_HTTP_UPSTREAM_FT_OFF) {<br>         conf->upstream.next_upstream = NGX_CONF_BITMASK_SET<br>diff -r 10678810de74 -r 3242f9829897 src/http/modules/ngx_http_proxy_module.c<br>--- a/src/http/modules/ngx_http_proxy_module.c     Wed May 20 12:21:32 2020 +0800<br>+++ b/src/http/modules/ngx_http_proxy_module.c  Wed May 20 12:24:05 2020 +0800<br>@@ -2934,7 +2934,7 @@<br> <br>     if (conf->upstream.store == NGX_CONF_UNSET) {<br>         ngx_conf_merge_value(conf->upstream.store,<br>-                              prev->upstream.store, 0);<br>+                             prev->upstream.store, 0);<br> <br>         conf->upstream.store_lengths = prev->upstream.store_lengths;<br>         conf->upstream.store_values = prev->upstream.store_values;<br>@@ -2947,22 +2947,22 @@<br>                               prev->upstream.next_upstream_tries, 0);<br> <br>     ngx_conf_merge_value(conf->upstream.buffering,<br>-                              prev->upstream.buffering, 1);<br>+                         prev->upstream.buffering, 1);<br> <br>     ngx_conf_merge_value(conf->upstream.request_buffering,<br>-                              prev->upstream.request_buffering, 1);<br>+                         prev->upstream.request_buffering, 1);<br> <br>     ngx_conf_merge_value(conf->upstream.ignore_client_abort,<br>-                              prev->upstream.ignore_client_abort, 0);<br>+                         prev->upstream.ignore_client_abort, 0);<br> <br>     ngx_conf_merge_value(conf->upstream.force_ranges,<br>-                              prev->upstream.force_ranges, 0);<br>+                         prev->upstream.force_ranges, 0);<br> <br>     ngx_conf_merge_ptr_value(conf->upstream.local,<br>-                              prev->upstream.local, NULL);<br>+                             prev->upstream.local, NULL);<br> <br>     ngx_conf_merge_value(conf->upstream.socket_keepalive,<br>-                              prev->upstream.socket_keepalive, 0);<br>+                         prev->upstream.socket_keepalive, 0);<br> <br>     ngx_conf_merge_msec_value(conf->upstream.connect_timeout,<br>                               prev->upstream.connect_timeout, 60000);<br>@@ -3078,15 +3078,15 @@<br> <br> <br>     ngx_conf_merge_bitmask_value(conf->upstream.ignore_headers,<br>-                              prev->upstream.ignore_headers,<br>-                              NGX_CONF_BITMASK_SET);<br>+                                 prev->upstream.ignore_headers,<br>+                                 NGX_CONF_BITMASK_SET);<br> <br> <br>     ngx_conf_merge_bitmask_value(conf->upstream.next_upstream,<br>-                              prev->upstream.next_upstream,<br>-                              (NGX_CONF_BITMASK_SET<br>-                               |NGX_HTTP_UPSTREAM_FT_ERROR<br>-                               |NGX_HTTP_UPSTREAM_FT_TIMEOUT));<br>+                                 prev->upstream.next_upstream,<br>+                                 (NGX_CONF_BITMASK_SET<br>+                                  |NGX_HTTP_UPSTREAM_FT_ERROR<br>+                                  |NGX_HTTP_UPSTREAM_FT_TIMEOUT));<br> <br>     if (conf->upstream.next_upstream & NGX_HTTP_UPSTREAM_FT_OFF) {<br>         conf->upstream.next_upstream = NGX_CONF_BITMASK_SET<br>@@ -3106,7 +3106,7 @@<br> <br>     if (conf->upstream.cache == NGX_CONF_UNSET) {<br>         ngx_conf_merge_value(conf->upstream.cache,<br>-                              prev->upstream.cache, 0);<br>+                             prev->upstream.cache, 0);<br> <br>         conf->upstream.cache_zone = prev->upstream.cache_zone;<br>         conf->upstream.cache_value = prev->upstream.cache_value;<br>@@ -3128,13 +3128,13 @@<br>                               prev->upstream.cache_min_uses, 1);<br> <br>     ngx_conf_merge_off_value(conf->upstream.cache_max_range_offset,<br>-                              prev->upstream.cache_max_range_offset,<br>-                              NGX_MAX_OFF_T_VALUE);<br>+                             prev->upstream.cache_max_range_offset,<br>+                             NGX_MAX_OFF_T_VALUE);<br> <br>     ngx_conf_merge_bitmask_value(conf->upstream.cache_use_stale,<br>-                              prev->upstream.cache_use_stale,<br>-                              (NGX_CONF_BITMASK_SET<br>-                               |NGX_HTTP_UPSTREAM_FT_OFF));<br>+                                 prev->upstream.cache_use_stale,<br>+                                 (NGX_CONF_BITMASK_SET<br>+                                  |NGX_HTTP_UPSTREAM_FT_OFF));<br> <br>     if (conf->upstream.cache_use_stale & NGX_HTTP_UPSTREAM_FT_OFF) {<br>         conf->upstream.cache_use_stale = NGX_CONF_BITMASK_SET<br>@@ -3165,7 +3165,7 @@<br>     }<br> <br>     ngx_conf_merge_value(conf->upstream.cache_lock,<br>-                              prev->upstream.cache_lock, 0);<br>+                         prev->upstream.cache_lock, 0);<br> <br>     ngx_conf_merge_msec_value(conf->upstream.cache_lock_timeout,<br>                               prev->upstream.cache_lock_timeout, 5000);<br>@@ -3174,13 +3174,13 @@<br>                               prev->upstream.cache_lock_age, 5000);<br> <br>     ngx_conf_merge_value(conf->upstream.cache_revalidate,<br>-                              prev->upstream.cache_revalidate, 0);<br>+                         prev->upstream.cache_revalidate, 0);<br> <br>     ngx_conf_merge_value(conf->upstream.cache_convert_head,<br>-                              prev->upstream.cache_convert_head, 1);<br>+                         prev->upstream.cache_convert_head, 1);<br> <br>     ngx_conf_merge_value(conf->upstream.cache_background_update,<br>-                              prev->upstream.cache_background_update, 0);<br>+                         prev->upstream.cache_background_update, 0);<br> <br> #endif<br> <br>@@ -3189,17 +3189,17 @@<br>     }<br> <br>     ngx_conf_merge_value(conf->upstream.pass_request_headers,<br>-                              prev->upstream.pass_request_headers, 1);<br>+                         prev->upstream.pass_request_headers, 1);<br>     ngx_conf_merge_value(conf->upstream.pass_request_body,<br>-                              prev->upstream.pass_request_body, 1);<br>+                         prev->upstream.pass_request_body, 1);<br> <br>     ngx_conf_merge_value(conf->upstream.intercept_errors,<br>-                              prev->upstream.intercept_errors, 0);<br>+                         prev->upstream.intercept_errors, 0);<br> <br> #if (NGX_HTTP_SSL)<br> <br>     ngx_conf_merge_value(conf->upstream.ssl_session_reuse,<br>-                              prev->upstream.ssl_session_reuse, 1);<br>+                         prev->upstream.ssl_session_reuse, 1);<br> <br>     ngx_conf_merge_bitmask_value(conf->ssl_protocols, prev->ssl_protocols,<br>                                  (NGX_CONF_BITMASK_SET|NGX_SSL_TLSv1<br>@@ -3213,19 +3213,19 @@<br>     }<br> <br>     ngx_conf_merge_value(conf->upstream.ssl_server_name,<br>-                              prev->upstream.ssl_server_name, 0);<br>+                         prev->upstream.ssl_server_name, 0);<br>     ngx_conf_merge_value(conf->upstream.ssl_verify,<br>-                              prev->upstream.ssl_verify, 0);<br>+                         prev->upstream.ssl_verify, 0);<br>     ngx_conf_merge_uint_value(conf->ssl_verify_depth,<br>                               prev->ssl_verify_depth, 1);<br>     ngx_conf_merge_str_value(conf->ssl_trusted_certificate,<br>-                              prev->ssl_trusted_certificate, "");<br>+                             prev->ssl_trusted_certificate, "");<br>     ngx_conf_merge_str_value(conf->ssl_crl, prev->ssl_crl, "");<br> <br>     ngx_conf_merge_str_value(conf->ssl_certificate,<br>-                              prev->ssl_certificate, "");<br>+                             prev->ssl_certificate, "");<br>     ngx_conf_merge_str_value(conf->ssl_certificate_key,<br>-                              prev->ssl_certificate_key, "");<br>+                             prev->ssl_certificate_key, "");<br>     ngx_conf_merge_ptr_value(conf->ssl_passwords, prev->ssl_passwords, NULL);<br> <br>     if (conf->ssl && ngx_http_proxy_set_ssl(cf, conf) != NGX_OK) {<br>@@ -3954,7 +3954,7 @@<br> <br>     if (plcf->cookie_paths == NGX_CONF_UNSET_PTR) {<br>         plcf->cookie_paths = ngx_array_create(cf->pool, 1,<br>-                                     sizeof(ngx_http_proxy_rewrite_t));<br>+                                              sizeof(ngx_http_proxy_rewrite_t));<br>         if (plcf->cookie_paths == NULL) {<br>             return NGX_CONF_ERROR;<br>         }<br>diff -r 10678810de74 -r 3242f9829897 src/http/modules/ngx_http_range_filter_module.c<br>--- a/src/http/modules/ngx_http_range_filter_module.c   Wed May 20 12:21:32 2020 +0800<br>+++ b/src/http/modules/ngx_http_range_filter_module.c   Wed May 20 12:24:05 2020 +0800<br>@@ -509,18 +509,18 @@<br> <br>     } else if (r->headers_out.content_type.len) {<br>         ctx->boundary_header.len = ngx_sprintf(ctx->boundary_header.data,<br>-                                           CRLF "--%0muA" CRLF<br>-                                           "Content-Type: %V" CRLF<br>-                                           "Content-Range: bytes ",<br>-                                           boundary,<br>-                                           &r->headers_out.content_type)<br>+                                               CRLF "--%0muA" CRLF<br>+                                               "Content-Type: %V" CRLF<br>+                                               "Content-Range: bytes ",<br>+                                               boundary,<br>+                                               &r->headers_out.content_type)<br>                                    - ctx->boundary_header.data;<br> <br>     } else {<br>         ctx->boundary_header.len = ngx_sprintf(ctx->boundary_header.data,<br>-                                           CRLF "--%0muA" CRLF<br>-                                           "Content-Range: bytes ",<br>-                                           boundary)<br>+                                               CRLF "--%0muA" CRLF<br>+                                               "Content-Range: bytes ",<br>+                                               boundary)<br>                                    - ctx->boundary_header.data;<br>     }<br> <br>diff -r 10678810de74 -r 3242f9829897 src/http/modules/ngx_http_rewrite_module.c<br>--- a/src/http/modules/ngx_http_rewrite_module.c       Wed May 20 12:21:32 2020 +0800<br>+++ b/src/http/modules/ngx_http_rewrite_module.c        Wed May 20 12:24:05 2020 +0800<br>@@ -802,7 +802,7 @@<br>         }<br> <br>         fop = ngx_http_script_start_code(cf->pool, &lcf->codes,<br>-                                          sizeof(ngx_http_script_file_code_t));<br>+                                         sizeof(ngx_http_script_file_code_t));<br>         if (fop == NULL) {<br>             return NGX_CONF_ERROR;<br>         }<br>diff -r 10678810de74 -r 3242f9829897 src/http/modules/ngx_http_scgi_module.c<br>--- a/src/http/modules/ngx_http_scgi_module.c       Wed May 20 12:21:32 2020 +0800<br>+++ b/src/http/modules/ngx_http_scgi_module.c   Wed May 20 12:24:05 2020 +0800<br>@@ -1292,22 +1292,22 @@<br>                               prev->upstream.next_upstream_tries, 0);<br> <br>     ngx_conf_merge_value(conf->upstream.buffering,<br>-                              prev->upstream.buffering, 1);<br>+                         prev->upstream.buffering, 1);<br> <br>     ngx_conf_merge_value(conf->upstream.request_buffering,<br>-                              prev->upstream.request_buffering, 1);<br>+                         prev->upstream.request_buffering, 1);<br> <br>     ngx_conf_merge_value(conf->upstream.ignore_client_abort,<br>-                              prev->upstream.ignore_client_abort, 0);<br>+                         prev->upstream.ignore_client_abort, 0);<br> <br>     ngx_conf_merge_value(conf->upstream.force_ranges,<br>-                              prev->upstream.force_ranges, 0);<br>+                         prev->upstream.force_ranges, 0);<br> <br>     ngx_conf_merge_ptr_value(conf->upstream.local,<br>-                              prev->upstream.local, NULL);<br>+                             prev->upstream.local, NULL);<br> <br>     ngx_conf_merge_value(conf->upstream.socket_keepalive,<br>-                              prev->upstream.socket_keepalive, 0);<br>+                         prev->upstream.socket_keepalive, 0);<br> <br>     ngx_conf_merge_msec_value(conf->upstream.connect_timeout,<br>                               prev->upstream.connect_timeout, 60000);<br>@@ -1372,8 +1372,8 @@<br>         > (conf->upstream.bufs.num - 1) * conf->upstream.bufs.size)<br>     {<br>         ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,<br>-            "\"scgi_busy_buffers_size\" must be less than "<br>-            "the size of all \"scgi_buffers\" minus one buffer");<br>+                           "\"scgi_busy_buffers_size\" must be less than "<br>+                           "the size of all \"scgi_buffers\" minus one buffer");<br> <br>         return NGX_CONF_ERROR;<br>     }<br>@@ -1452,7 +1452,7 @@<br> <br>     if (conf->upstream.cache == NGX_CONF_UNSET) {<br>         ngx_conf_merge_value(conf->upstream.cache,<br>-                              prev->upstream.cache, 0);<br>+                             prev->upstream.cache, 0);<br> <br>         conf->upstream.cache_zone = prev->upstream.cache_zone;<br>         conf->upstream.cache_value = prev->upstream.cache_value;<br>@@ -1474,13 +1474,13 @@<br>                               prev->upstream.cache_min_uses, 1);<br> <br>     ngx_conf_merge_off_value(conf->upstream.cache_max_range_offset,<br>-                              prev->upstream.cache_max_range_offset,<br>-                              NGX_MAX_OFF_T_VALUE);<br>+                             prev->upstream.cache_max_range_offset,<br>+                             NGX_MAX_OFF_T_VALUE);<br> <br>     ngx_conf_merge_bitmask_value(conf->upstream.cache_use_stale,<br>-                              prev->upstream.cache_use_stale,<br>-                              (NGX_CONF_BITMASK_SET<br>-                               |NGX_HTTP_UPSTREAM_FT_OFF));<br>+                                 prev->upstream.cache_use_stale,<br>+                                 (NGX_CONF_BITMASK_SET<br>+                                  |NGX_HTTP_UPSTREAM_FT_OFF));<br> <br>     if (conf->upstream.cache_use_stale & NGX_HTTP_UPSTREAM_FT_OFF) {<br>         conf->upstream.cache_use_stale = NGX_CONF_BITMASK_SET<br>@@ -1516,7 +1516,7 @@<br>     }<br> <br>     ngx_conf_merge_value(conf->upstream.cache_lock,<br>-                              prev->upstream.cache_lock, 0);<br>+                         prev->upstream.cache_lock, 0);<br> <br>     ngx_conf_merge_msec_value(conf->upstream.cache_lock_timeout,<br>                               prev->upstream.cache_lock_timeout, 5000);<br>@@ -1525,10 +1525,10 @@<br>                               prev->upstream.cache_lock_age, 5000);<br> <br>     ngx_conf_merge_value(conf->upstream.cache_revalidate,<br>-                              prev->upstream.cache_revalidate, 0);<br>+                         prev->upstream.cache_revalidate, 0);<br> <br>     ngx_conf_merge_value(conf->upstream.cache_background_update,<br>-                              prev->upstream.cache_background_update, 0);<br>+                         prev->upstream.cache_background_update, 0);<br> <br> #endif<br> <br>diff -r 10678810de74 -r 3242f9829897 src/http/modules/ngx_http_ssl_module.c<br>--- a/src/http/modules/ngx_http_ssl_module.c      Wed May 20 12:21:32 2020 +0800<br>+++ b/src/http/modules/ngx_http_ssl_module.c    Wed May 20 12:24:05 2020 +0800<br>@@ -613,31 +613,31 @@<br>     ngx_conf_merge_value(conf->early_data, prev->early_data, 0);<br> <br>     ngx_conf_merge_bitmask_value(conf->protocols, prev->protocols,<br>-                         (NGX_CONF_BITMASK_SET|NGX_SSL_TLSv1<br>-                          |NGX_SSL_TLSv1_1|NGX_SSL_TLSv1_2));<br>+                                 (NGX_CONF_BITMASK_SET|NGX_SSL_TLSv1<br>+                                  |NGX_SSL_TLSv1_1|NGX_SSL_TLSv1_2));<br> <br>     ngx_conf_merge_size_value(conf->buffer_size, prev->buffer_size,<br>-                         NGX_SSL_BUFSIZE);<br>+                              NGX_SSL_BUFSIZE);<br> <br>     ngx_conf_merge_uint_value(conf->verify, prev->verify, 0);<br>     ngx_conf_merge_uint_value(conf->verify_depth, prev->verify_depth, 1);<br> <br>     ngx_conf_merge_ptr_value(conf->certificates, prev->certificates, NULL);<br>     ngx_conf_merge_ptr_value(conf->certificate_keys, prev->certificate_keys,<br>-                         NULL);<br>+                             NULL);<br> <br>     ngx_conf_merge_ptr_value(conf->passwords, prev->passwords, NULL);<br> <br>     ngx_conf_merge_str_value(conf->dhparam, prev->dhparam, "");<br> <br>     ngx_conf_merge_str_value(conf->client_certificate, prev->client_certificate,<br>-                         "");<br>+                             "");<br>     ngx_conf_merge_str_value(conf->trusted_certificate,<br>-                         prev->trusted_certificate, "");<br>+                             prev->trusted_certificate, "");<br>     ngx_conf_merge_str_value(conf->crl, prev->crl, "");<br> <br>     ngx_conf_merge_str_value(conf->ecdh_curve, prev->ecdh_curve,<br>-                         NGX_DEFAULT_ECDH_CURVE);<br>+                             NGX_DEFAULT_ECDH_CURVE);<br> <br>     ngx_conf_merge_str_value(conf->ciphers, prev->ciphers, NGX_DEFAULT_CIPHERS);<br> <br>@@ -645,7 +645,7 @@<br>     ngx_conf_merge_value(conf->stapling_verify, prev->stapling_verify, 0);<br>     ngx_conf_merge_str_value(conf->stapling_file, prev->stapling_file, "");<br>     ngx_conf_merge_str_value(conf->stapling_responder,<br>-                         prev->stapling_responder, "");<br>+                             prev->stapling_responder, "");<br> <br>     conf->ssl.log = cf->log;<br> <br>@@ -834,7 +834,7 @@<br> #endif<br> <br>     ngx_conf_merge_ptr_value(conf->session_ticket_keys,<br>-                         prev->session_ticket_keys, NULL);<br>+                             prev->session_ticket_keys, NULL);<br> <br>     if (ngx_ssl_session_ticket_keys(cf, &conf->ssl, conf->session_ticket_keys)<br>         != NGX_OK)<br>diff -r 10678810de74 -r 3242f9829897 src/http/modules/ngx_http_uwsgi_module.c<br>--- a/src/http/modules/ngx_http_uwsgi_module.c Wed May 20 12:21:32 2020 +0800<br>+++ b/src/http/modules/ngx_http_uwsgi_module.c  Wed May 20 12:24:05 2020 +0800<br>@@ -1513,22 +1513,22 @@<br>                               prev->upstream.next_upstream_tries, 0);<br> <br>     ngx_conf_merge_value(conf->upstream.buffering,<br>-                              prev->upstream.buffering, 1);<br>+                         prev->upstream.buffering, 1);<br> <br>     ngx_conf_merge_value(conf->upstream.request_buffering,<br>-                              prev->upstream.request_buffering, 1);<br>+                         prev->upstream.request_buffering, 1);<br> <br>     ngx_conf_merge_value(conf->upstream.ignore_client_abort,<br>-                              prev->upstream.ignore_client_abort, 0);<br>+                         prev->upstream.ignore_client_abort, 0);<br> <br>     ngx_conf_merge_value(conf->upstream.force_ranges,<br>-                              prev->upstream.force_ranges, 0);<br>+                         prev->upstream.force_ranges, 0);<br> <br>     ngx_conf_merge_ptr_value(conf->upstream.local,<br>-                              prev->upstream.local, NULL);<br>+                             prev->upstream.local, NULL);<br> <br>     ngx_conf_merge_value(conf->upstream.socket_keepalive,<br>-                              prev->upstream.socket_keepalive, 0);<br>+                         prev->upstream.socket_keepalive, 0);<br> <br>     ngx_conf_merge_msec_value(conf->upstream.connect_timeout,<br>                               prev->upstream.connect_timeout, 60000);<br>@@ -1673,7 +1673,7 @@<br> <br>     if (conf->upstream.cache == NGX_CONF_UNSET) {<br>         ngx_conf_merge_value(conf->upstream.cache,<br>-                              prev->upstream.cache, 0);<br>+                             prev->upstream.cache, 0);<br> <br>         conf->upstream.cache_zone = prev->upstream.cache_zone;<br>         conf->upstream.cache_value = prev->upstream.cache_value;<br>@@ -1695,12 +1695,12 @@<br>                               prev->upstream.cache_min_uses, 1);<br> <br>     ngx_conf_merge_off_value(conf->upstream.cache_max_range_offset,<br>-                              prev->upstream.cache_max_range_offset,<br>-                              NGX_MAX_OFF_T_VALUE);<br>+                             prev->upstream.cache_max_range_offset,<br>+                             NGX_MAX_OFF_T_VALUE);<br> <br>     ngx_conf_merge_bitmask_value(conf->upstream.cache_use_stale,<br>-                              prev->upstream.cache_use_stale,<br>-                              (NGX_CONF_BITMASK_SET<br>+                                 prev->upstream.cache_use_stale,<br>+                                 (NGX_CONF_BITMASK_SET<br>                                |NGX_HTTP_UPSTREAM_FT_OFF));<br> <br>     if (conf->upstream.cache_use_stale & NGX_HTTP_UPSTREAM_FT_OFF) {<br>@@ -1737,7 +1737,7 @@<br>     }<br> <br>     ngx_conf_merge_value(conf->upstream.cache_lock,<br>-                              prev->upstream.cache_lock, 0);<br>+                         prev->upstream.cache_lock, 0);<br> <br>     ngx_conf_merge_msec_value(conf->upstream.cache_lock_timeout,<br>                               prev->upstream.cache_lock_timeout, 5000);<br>@@ -1746,10 +1746,10 @@<br>                               prev->upstream.cache_lock_age, 5000);<br> <br>     ngx_conf_merge_value(conf->upstream.cache_revalidate,<br>-                              prev->upstream.cache_revalidate, 0);<br>+                         prev->upstream.cache_revalidate, 0);<br> <br>     ngx_conf_merge_value(conf->upstream.cache_background_update,<br>-                              prev->upstream.cache_background_update, 0);<br>+                         prev->upstream.cache_background_update, 0);<br> <br> #endif<br> <br>@@ -1764,7 +1764,7 @@<br> #if (NGX_HTTP_SSL)<br> <br>     ngx_conf_merge_value(conf->upstream.ssl_session_reuse,<br>-                              prev->upstream.ssl_session_reuse, 1);<br>+                         prev->upstream.ssl_session_reuse, 1);<br> <br>     ngx_conf_merge_bitmask_value(conf->ssl_protocols, prev->ssl_protocols,<br>                                  (NGX_CONF_BITMASK_SET|NGX_SSL_TLSv1<br>@@ -1778,19 +1778,19 @@<br>     }<br> <br>     ngx_conf_merge_value(conf->upstream.ssl_server_name,<br>-                              prev->upstream.ssl_server_name, 0);<br>+                         prev->upstream.ssl_server_name, 0);<br>     ngx_conf_merge_value(conf->upstream.ssl_verify,<br>-                              prev->upstream.ssl_verify, 0);<br>+                         prev->upstream.ssl_verify, 0);<br>     ngx_conf_merge_uint_value(conf->ssl_verify_depth,<br>                               prev->ssl_verify_depth, 1);<br>     ngx_conf_merge_str_value(conf->ssl_trusted_certificate,<br>-                              prev->ssl_trusted_certificate, "");<br>+                             prev->ssl_trusted_certificate, "");<br>     ngx_conf_merge_str_value(conf->ssl_crl, prev->ssl_crl, "");<br> <br>     ngx_conf_merge_str_value(conf->ssl_certificate,<br>-                              prev->ssl_certificate, "");<br>+                             prev->ssl_certificate, "");<br>     ngx_conf_merge_str_value(conf->ssl_certificate_key,<br>-                              prev->ssl_certificate_key, "");<br>+                             prev->ssl_certificate_key, "");<br>     ngx_conf_merge_ptr_value(conf->ssl_passwords, prev->ssl_passwords, NULL);<br> <br>     if (conf->ssl && ngx_http_uwsgi_set_ssl(cf, conf) != NGX_OK) {<br>diff -r 10678810de74 -r 3242f9829897 src/http/modules/ngx_http_xslt_filter_module.c<br>--- a/src/http/modules/ngx_http_xslt_filter_module.c Wed May 20 12:21:32 2020 +0800<br>+++ b/src/http/modules/ngx_http_xslt_filter_module.c    Wed May 20 12:24:05 2020 +0800<br>@@ -318,7 +318,7 @@<br> <br>     if (b == NULL) {<br>         return ngx_http_filter_finalize_request(r, &ngx_http_xslt_filter_module,<br>-                                               NGX_HTTP_INTERNAL_SERVER_ERROR);<br>+                                                NGX_HTTP_INTERNAL_SERVER_ERROR);<br>     }<br> <br>     cln = ngx_pool_cleanup_add(r->pool, 0);<br>@@ -326,7 +326,7 @@<br>     if (cln == NULL) {<br>         ngx_free(b->pos);<br>         return ngx_http_filter_finalize_request(r, &ngx_http_xslt_filter_module,<br>-                                               NGX_HTTP_INTERNAL_SERVER_ERROR);<br>+                                                NGX_HTTP_INTERNAL_SERVER_ERROR);<br>     }<br> <br>     if (r == r->main) {<br>@@ -704,7 +704,7 @@<br>             p = (u_char *) ngx_strchr(p, '=');<br>             if (p == NULL) {<br>                 ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,<br>-                                "invalid libxslt parameter \"%s\"", value);<br>+                              "invalid libxslt parameter \"%s\"", value);<br>                 return NGX_ERROR;<br>             }<br>             *p++ = '\0';<br></div><div><br></div><div><br></div><div>Thanks!</div></div>