summaryrefslogtreecommitdiffhomepage
path: root/src/nxt_http_static.c
diff options
context:
space:
mode:
authorDan Callahan <d.callahan@f5.com>2024-02-27 15:15:42 +0000
committerDan Callahan <d.callahan@f5.com>2024-02-27 15:15:42 +0000
commitd76761901c4084bcdbc5a449e9bbb47d56b7093c (patch)
treeb4b7b4e3d588b73a2adcc0094cab466d9194c679 /src/nxt_http_static.c
parentc43629880472bba8d389dfb0b7ae6d883b0ba499 (diff)
parent088117008c9e8f397a58cc8d8070ce047beff12f (diff)
downloadunit-d76761901c4084bcdbc5a449e9bbb47d56b7093c.tar.gz
unit-d76761901c4084bcdbc5a449e9bbb47d56b7093c.tar.bz2
Merge tag '1.32.0' into branches/packaging1.32.0-1
Unit 1.32.0 release.
Diffstat (limited to '')
-rw-r--r--src/nxt_http_static.c11
1 files changed, 2 insertions, 9 deletions
diff --git a/src/nxt_http_static.c b/src/nxt_http_static.c
index e51ba6b0..ee25015e 100644
--- a/src/nxt_http_static.c
+++ b/src/nxt_http_static.c
@@ -117,9 +117,7 @@ nxt_http_static_init(nxt_task_t *task, nxt_router_temp_conf_t *tmcf,
nxt_str_set(&conf->index, "index.html");
} else {
- nxt_conf_get_string(acf->index, &str);
-
- ret = nxt_str_dup(mp, &conf->index, &str);
+ ret = nxt_conf_get_string_dup(acf->index, mp, &conf->index);
if (nxt_slow_path(ret == NULL)) {
return NXT_ERROR;
}
@@ -879,12 +877,7 @@ complete_buf:
n = nxt_file_read(fb->file, b->mem.start, size, fb->file_pos);
- if (n != size) {
- if (n >= 0) {
- nxt_log(task, NXT_LOG_ERR, "file \"%FN\" has changed "
- "while sending response to a client", fb->file->name);
- }
-
+ if (nxt_slow_path(n == NXT_ERROR)) {
nxt_http_request_error_handler(task, r, r->proto.any);
goto clean;
}