summaryrefslogtreecommitdiffhomepage
path: root/src/http
diff options
context:
space:
mode:
Diffstat (limited to 'src/http')
-rw-r--r--src/http/modules/ngx_http_dav_module.c10
-rw-r--r--src/http/modules/ngx_http_fastcgi_module.c10
-rw-r--r--src/http/modules/ngx_http_image_filter_module.c2
-rw-r--r--src/http/modules/ngx_http_mp4_module.c16
-rw-r--r--src/http/modules/ngx_http_range_filter_module.c2
-rw-r--r--src/http/modules/ngx_http_realip_module.c4
-rw-r--r--src/http/modules/ngx_http_referer_module.c2
-rw-r--r--src/http/modules/ngx_http_rewrite_module.c2
-rw-r--r--src/http/modules/ngx_http_scgi_module.c2
-rw-r--r--src/http/modules/ngx_http_ssl_module.c4
-rw-r--r--src/http/modules/ngx_http_upstream_least_conn_module.c2
-rw-r--r--src/http/ngx_http_core_module.c36
-rw-r--r--src/http/ngx_http_core_module.h8
-rw-r--r--src/http/ngx_http_script.c4
-rw-r--r--src/http/ngx_http_upstream.c24
-rw-r--r--src/http/ngx_http_upstream_round_robin.c2
-rw-r--r--src/http/v2/ngx_http_v2_module.c2
17 files changed, 66 insertions, 66 deletions
diff --git a/src/http/modules/ngx_http_dav_module.c b/src/http/modules/ngx_http_dav_module.c
index b9fadd001..36002656b 100644
--- a/src/http/modules/ngx_http_dav_module.c
+++ b/src/http/modules/ngx_http_dav_module.c
@@ -621,11 +621,11 @@ destination_done:
if ((r->uri.data[r->uri.len - 1] == '/' && *(last - 1) != '/')
|| (r->uri.data[r->uri.len - 1] != '/' && *(last - 1) == '/'))
{
- ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
- "both URI \"%V\" and \"Destination\" URI \"%V\" "
- "should be either collections or non-collections",
- &r->uri, &dest->value);
- return NGX_HTTP_CONFLICT;
+ ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
+ "both URI \"%V\" and \"Destination\" URI \"%V\" "
+ "should be either collections or non-collections",
+ &r->uri, &dest->value);
+ return NGX_HTTP_CONFLICT;
}
depth = ngx_http_dav_depth(r, NGX_HTTP_DAV_INFINITY_DEPTH);
diff --git a/src/http/modules/ngx_http_fastcgi_module.c b/src/http/modules/ngx_http_fastcgi_module.c
index e3024b347..378f3fd64 100644
--- a/src/http/modules/ngx_http_fastcgi_module.c
+++ b/src/http/modules/ngx_http_fastcgi_module.c
@@ -751,7 +751,7 @@ ngx_http_fastcgi_eval(ngx_http_request_t *r, ngx_http_fastcgi_loc_conf_t *flcf)
url.no_resolve = 1;
if (ngx_parse_url(r->pool, &url) != NGX_OK) {
- if (url.err) {
+ if (url.err) {
ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
"%s in upstream \"%V\"", url.err, &url.url);
}
@@ -1800,7 +1800,7 @@ ngx_http_fastcgi_process_header(ngx_http_request_t *r)
} else {
r->cache->header_start += u->buffer.pos - start
- - sizeof(ngx_http_fastcgi_header_t);
+ - sizeof(ngx_http_fastcgi_header_t);
}
f->large_stderr = 0;
@@ -2558,8 +2558,8 @@ ngx_http_fastcgi_process_record(ngx_http_request_t *r,
case NGX_HTTP_FASTCGI_STDOUT:
case NGX_HTTP_FASTCGI_STDERR:
case NGX_HTTP_FASTCGI_END_REQUEST:
- f->type = (ngx_uint_t) ch;
- break;
+ f->type = (ngx_uint_t) ch;
+ break;
default:
ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
"upstream sent invalid FastCGI "
@@ -2654,7 +2654,7 @@ ngx_http_fastcgi_finalize_request(ngx_http_request_t *r, ngx_int_t rc)
static ngx_int_t
ngx_http_fastcgi_add_variables(ngx_conf_t *cf)
{
- ngx_http_variable_t *var, *v;
+ ngx_http_variable_t *var, *v;
for (v = ngx_http_fastcgi_vars; v->name.len; v++) {
var = ngx_http_add_variable(cf, &v->name, v->flags);
diff --git a/src/http/modules/ngx_http_image_filter_module.c b/src/http/modules/ngx_http_image_filter_module.c
index bd7a30970..e70b427f0 100644
--- a/src/http/modules/ngx_http_image_filter_module.c
+++ b/src/http/modules/ngx_http_image_filter_module.c
@@ -144,7 +144,7 @@ static ngx_command_t ngx_http_image_filter_commands[] = {
offsetof(ngx_http_image_filter_conf_t, transparency),
NULL },
- { ngx_string("image_filter_interlace"),
+ { ngx_string("image_filter_interlace"),
NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_FLAG,
ngx_conf_set_flag_slot,
NGX_HTTP_LOC_CONF_OFFSET,
diff --git a/src/http/modules/ngx_http_mp4_module.c b/src/http/modules/ngx_http_mp4_module.c
index 980bf5719..04bf9c1bc 100644
--- a/src/http/modules/ngx_http_mp4_module.c
+++ b/src/http/modules/ngx_http_mp4_module.c
@@ -2555,14 +2555,14 @@ ngx_http_mp4_crop_ctts_data(ngx_http_mp4_file_t *mp4,
"sample:%uD, count:%uD, offset:%uD",
start_sample, count, ngx_mp4_get_32value(entry->offset));
- if (start_sample <= count) {
- rest = start_sample - 1;
- goto found;
- }
-
- start_sample -= count;
- entries--;
- entry++;
+ if (start_sample <= count) {
+ rest = start_sample - 1;
+ goto found;
+ }
+
+ start_sample -= count;
+ entries--;
+ entry++;
}
if (start) {
diff --git a/src/http/modules/ngx_http_range_filter_module.c b/src/http/modules/ngx_http_range_filter_module.c
index b07b2e25e..55bb8ae95 100644
--- a/src/http/modules/ngx_http_range_filter_module.c
+++ b/src/http/modules/ngx_http_range_filter_module.c
@@ -665,7 +665,7 @@ ngx_http_range_test_overlapped(ngx_http_request_t *r,
range = ctx->ranges.elts;
for (i = 0; i < ctx->ranges.nelts; i++) {
if (start > range[i].start || last < range[i].end) {
- goto overlapped;
+ goto overlapped;
}
}
}
diff --git a/src/http/modules/ngx_http_realip_module.c b/src/http/modules/ngx_http_realip_module.c
index c3d7ebec8..b7befe6cb 100644
--- a/src/http/modules/ngx_http_realip_module.c
+++ b/src/http/modules/ngx_http_realip_module.c
@@ -328,8 +328,8 @@ ngx_http_realip_from(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
#if (NGX_HAVE_UNIX_DOMAIN)
if (ngx_strcmp(value[1].data, "unix:") == 0) {
- cidr->family = AF_UNIX;
- return NGX_CONF_OK;
+ cidr->family = AF_UNIX;
+ return NGX_CONF_OK;
}
#endif
diff --git a/src/http/modules/ngx_http_referer_module.c b/src/http/modules/ngx_http_referer_module.c
index b417eb227..3f0f78e11 100644
--- a/src/http/modules/ngx_http_referer_module.c
+++ b/src/http/modules/ngx_http_referer_module.c
@@ -109,7 +109,7 @@ ngx_module_t ngx_http_referer_module = {
static ngx_int_t
ngx_http_referer_variable(ngx_http_request_t *r, ngx_http_variable_value_t *v,
- uintptr_t data)
+ uintptr_t data)
{
u_char *p, *ref, *last;
size_t len;
diff --git a/src/http/modules/ngx_http_rewrite_module.c b/src/http/modules/ngx_http_rewrite_module.c
index 2ec7f5d10..6b2444cbd 100644
--- a/src/http/modules/ngx_http_rewrite_module.c
+++ b/src/http/modules/ngx_http_rewrite_module.c
@@ -571,7 +571,7 @@ ngx_http_rewrite_if(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
mconf = module->create_loc_conf(cf);
if (mconf == NULL) {
- return NGX_CONF_ERROR;
+ return NGX_CONF_ERROR;
}
ctx->loc_conf[cf->cycle->modules[i]->ctx_index] = mconf;
diff --git a/src/http/modules/ngx_http_scgi_module.c b/src/http/modules/ngx_http_scgi_module.c
index b468eb7a2..f09617e87 100644
--- a/src/http/modules/ngx_http_scgi_module.c
+++ b/src/http/modules/ngx_http_scgi_module.c
@@ -876,7 +876,7 @@ ngx_http_scgi_create_request(ngx_http_request_t *r)
next:
continue;
- }
+ }
}
*b->last++ = (u_char) ',';
diff --git a/src/http/modules/ngx_http_ssl_module.c b/src/http/modules/ngx_http_ssl_module.c
index 7b051ea98..778bc9320 100644
--- a/src/http/modules/ngx_http_ssl_module.c
+++ b/src/http/modules/ngx_http_ssl_module.c
@@ -337,8 +337,8 @@ ngx_http_ssl_alpn_select(ngx_ssl_conn_t *ssl_conn, const unsigned char **out,
#if (NGX_DEBUG)
for (i = 0; i < inlen; i += in[i] + 1) {
- ngx_log_debug2(NGX_LOG_DEBUG_HTTP, c->log, 0,
- "SSL ALPN supported by client: %*s", in[i], &in[i + 1]);
+ ngx_log_debug2(NGX_LOG_DEBUG_HTTP, c->log, 0,
+ "SSL ALPN supported by client: %*s", in[i], &in[i + 1]);
}
#endif
diff --git a/src/http/modules/ngx_http_upstream_least_conn_module.c b/src/http/modules/ngx_http_upstream_least_conn_module.c
index 92951bd20..8a300c1b2 100644
--- a/src/http/modules/ngx_http_upstream_least_conn_module.c
+++ b/src/http/modules/ngx_http_upstream_least_conn_module.c
@@ -259,7 +259,7 @@ failed:
/ (8 * sizeof(uintptr_t));
for (i = 0; i < n; i++) {
- rrp->tried[i] = 0;
+ rrp->tried[i] = 0;
}
ngx_http_upstream_rr_peers_unlock(peers);
diff --git a/src/http/ngx_http_core_module.c b/src/http/ngx_http_core_module.c
index b88e86966..7a126bd84 100644
--- a/src/http/ngx_http_core_module.c
+++ b/src/http/ngx_http_core_module.c
@@ -1222,7 +1222,7 @@ ngx_http_core_try_files_phase(ngx_http_request_t *r,
}
name = path.data + root;
- }
+ }
if (tf->values == NULL) {
@@ -3104,7 +3104,7 @@ ngx_http_core_location(ngx_conf_t *cf, ngx_command_t *cmd, void *dummy)
ctx->loc_conf[cf->cycle->modules[i]->ctx_index] =
module->create_loc_conf(cf);
if (ctx->loc_conf[cf->cycle->modules[i]->ctx_index] == NULL) {
- return NGX_CONF_ERROR;
+ return NGX_CONF_ERROR;
}
}
}
@@ -4540,21 +4540,21 @@ ngx_http_core_root(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
static ngx_http_method_name_t ngx_methods_names[] = {
- { (u_char *) "GET", (uint32_t) ~NGX_HTTP_GET },
- { (u_char *) "HEAD", (uint32_t) ~NGX_HTTP_HEAD },
- { (u_char *) "POST", (uint32_t) ~NGX_HTTP_POST },
- { (u_char *) "PUT", (uint32_t) ~NGX_HTTP_PUT },
- { (u_char *) "DELETE", (uint32_t) ~NGX_HTTP_DELETE },
- { (u_char *) "MKCOL", (uint32_t) ~NGX_HTTP_MKCOL },
- { (u_char *) "COPY", (uint32_t) ~NGX_HTTP_COPY },
- { (u_char *) "MOVE", (uint32_t) ~NGX_HTTP_MOVE },
- { (u_char *) "OPTIONS", (uint32_t) ~NGX_HTTP_OPTIONS },
- { (u_char *) "PROPFIND", (uint32_t) ~NGX_HTTP_PROPFIND },
- { (u_char *) "PROPPATCH", (uint32_t) ~NGX_HTTP_PROPPATCH },
- { (u_char *) "LOCK", (uint32_t) ~NGX_HTTP_LOCK },
- { (u_char *) "UNLOCK", (uint32_t) ~NGX_HTTP_UNLOCK },
- { (u_char *) "PATCH", (uint32_t) ~NGX_HTTP_PATCH },
- { NULL, 0 }
+ { (u_char *) "GET", (uint32_t) ~NGX_HTTP_GET },
+ { (u_char *) "HEAD", (uint32_t) ~NGX_HTTP_HEAD },
+ { (u_char *) "POST", (uint32_t) ~NGX_HTTP_POST },
+ { (u_char *) "PUT", (uint32_t) ~NGX_HTTP_PUT },
+ { (u_char *) "DELETE", (uint32_t) ~NGX_HTTP_DELETE },
+ { (u_char *) "MKCOL", (uint32_t) ~NGX_HTTP_MKCOL },
+ { (u_char *) "COPY", (uint32_t) ~NGX_HTTP_COPY },
+ { (u_char *) "MOVE", (uint32_t) ~NGX_HTTP_MOVE },
+ { (u_char *) "OPTIONS", (uint32_t) ~NGX_HTTP_OPTIONS },
+ { (u_char *) "PROPFIND", (uint32_t) ~NGX_HTTP_PROPFIND },
+ { (u_char *) "PROPPATCH", (uint32_t) ~NGX_HTTP_PROPPATCH },
+ { (u_char *) "LOCK", (uint32_t) ~NGX_HTTP_LOCK },
+ { (u_char *) "UNLOCK", (uint32_t) ~NGX_HTTP_UNLOCK },
+ { (u_char *) "PATCH", (uint32_t) ~NGX_HTTP_PATCH },
+ { NULL, 0 }
};
@@ -4627,7 +4627,7 @@ ngx_http_core_limit_except(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
mconf = module->create_loc_conf(cf);
if (mconf == NULL) {
- return NGX_CONF_ERROR;
+ return NGX_CONF_ERROR;
}
ctx->loc_conf[cf->cycle->modules[i]->ctx_index] = mconf;
diff --git a/src/http/ngx_http_core_module.h b/src/http/ngx_http_core_module.h
index 231c507c3..6c446a05a 100644
--- a/src/http/ngx_http_core_module.h
+++ b/src/http/ngx_http_core_module.h
@@ -232,10 +232,10 @@ typedef struct {
typedef struct {
- ngx_hash_combined_t names;
+ ngx_hash_combined_t names;
- ngx_uint_t nregex;
- ngx_http_server_name_t *regex;
+ ngx_uint_t nregex;
+ ngx_http_server_name_t *regex;
} ngx_http_virtual_names_t;
@@ -544,7 +544,7 @@ typedef ngx_int_t (*ngx_http_request_body_filter_pt)
ngx_int_t ngx_http_output_filter(ngx_http_request_t *r, ngx_chain_t *chain);
ngx_int_t ngx_http_write_filter(ngx_http_request_t *r, ngx_chain_t *chain);
ngx_int_t ngx_http_request_body_save_filter(ngx_http_request_t *r,
- ngx_chain_t *chain);
+ ngx_chain_t *chain);
ngx_int_t ngx_http_set_disable_symlinks(ngx_http_request_t *r,
diff --git a/src/http/ngx_http_script.c b/src/http/ngx_http_script.c
index 02e2be3bb..879c63cbb 100644
--- a/src/http/ngx_http_script.c
+++ b/src/http/ngx_http_script.c
@@ -19,10 +19,10 @@ static ngx_int_t ngx_http_script_add_var_code(ngx_http_script_compile_t *sc,
static ngx_int_t ngx_http_script_add_args_code(ngx_http_script_compile_t *sc);
#if (NGX_PCRE)
static ngx_int_t ngx_http_script_add_capture_code(ngx_http_script_compile_t *sc,
- ngx_uint_t n);
+ ngx_uint_t n);
#endif
static ngx_int_t
- ngx_http_script_add_full_name_code(ngx_http_script_compile_t *sc);
+ ngx_http_script_add_full_name_code(ngx_http_script_compile_t *sc);
static size_t ngx_http_script_full_name_len_code(ngx_http_script_engine_t *e);
static void ngx_http_script_full_name_code(ngx_http_script_engine_t *e);
diff --git a/src/http/ngx_http_upstream.c b/src/http/ngx_http_upstream.c
index 911049fd0..1386bdb95 100644
--- a/src/http/ngx_http_upstream.c
+++ b/src/http/ngx_http_upstream.c
@@ -1883,17 +1883,17 @@ ngx_http_upstream_send_request_body(ngx_http_request_t *r,
if (!r->request_body_no_buffering) {
- /* buffered request body */
+ /* buffered request body */
- if (!u->request_sent) {
- u->request_sent = 1;
- out = u->request_bufs;
+ if (!u->request_sent) {
+ u->request_sent = 1;
+ out = u->request_bufs;
- } else {
- out = NULL;
- }
+ } else {
+ out = NULL;
+ }
- return ngx_output_chain(&u->output, out);
+ return ngx_output_chain(&u->output, out);
}
if (!u->request_sent) {
@@ -4327,10 +4327,10 @@ ngx_http_upstream_process_cache_control(ngx_http_request_t *r,
pa = &u->headers_in.cache_control;
if (pa->elts == NULL) {
- if (ngx_array_init(pa, r->pool, 2, sizeof(ngx_table_elt_t *)) != NGX_OK)
- {
- return NGX_ERROR;
- }
+ if (ngx_array_init(pa, r->pool, 2, sizeof(ngx_table_elt_t *)) != NGX_OK)
+ {
+ return NGX_ERROR;
+ }
}
ph = ngx_array_push(pa);
diff --git a/src/http/ngx_http_upstream_round_robin.c b/src/http/ngx_http_upstream_round_robin.c
index d6ae33bf1..8342dc8ed 100644
--- a/src/http/ngx_http_upstream_round_robin.c
+++ b/src/http/ngx_http_upstream_round_robin.c
@@ -480,7 +480,7 @@ failed:
/ (8 * sizeof(uintptr_t));
for (i = 0; i < n; i++) {
- rrp->tried[i] = 0;
+ rrp->tried[i] = 0;
}
ngx_http_upstream_rr_peers_unlock(peers);
diff --git a/src/http/v2/ngx_http_v2_module.c b/src/http/v2/ngx_http_v2_module.c
index d99ac3008..5a4561c2b 100644
--- a/src/http/v2/ngx_http_v2_module.c
+++ b/src/http/v2/ngx_http_v2_module.c
@@ -215,7 +215,7 @@ static ngx_http_variable_t ngx_http_v2_vars[] = {
static ngx_int_t
ngx_http_v2_add_variables(ngx_conf_t *cf)
{
- ngx_http_variable_t *var, *v;
+ ngx_http_variable_t *var, *v;
for (v = ngx_http_v2_vars; v->name.len; v++) {
var = ngx_http_add_variable(cf, &v->name, v->flags);
generated by cgit (git 2.34.1) at 2025-12-30 13:45:52 +0000