aboutsummaryrefslogtreecommitdiff
path: root/src/http/modules
diff options
context:
space:
mode:
Diffstat (limited to 'src/http/modules')
-rw-r--r--src/http/modules/ngx_http_index_handler.c6
-rw-r--r--src/http/modules/ngx_http_static_handler.c24
-rw-r--r--src/http/modules/proxy/ngx_http_proxy_cache.c6
3 files changed, 18 insertions, 18 deletions
diff --git a/src/http/modules/ngx_http_index_handler.c b/src/http/modules/ngx_http_index_handler.c
index 989de0051..e31bf3d09 100644
--- a/src/http/modules/ngx_http_index_handler.c
+++ b/src/http/modules/ngx_http_index_handler.c
@@ -202,7 +202,7 @@ static int ngx_http_index_test_dir(ngx_http_request_t *r,
ngx_log_debug(r->connection->log, "IS_DIR: %s" _ r->path.data);
- if (ngx_file_type(r->path.data, &r->file.info) == -1) {
+ if (ngx_file_info(r->path.data, &r->file.info) == -1) {
err = ngx_errno;
@@ -212,14 +212,14 @@ ngx_log_debug(r->connection->log, "IS_DIR: %s" _ r->path.data);
}
ngx_log_error(NGX_LOG_CRIT, r->connection->log, err,
- ngx_file_type_n " %s failed", r->path.data);
+ ngx_file_info_n " %s failed", r->path.data);
return NGX_HTTP_INTERNAL_SERVER_ERROR;
}
r->path.data[r->path.len - 1] = '/';
- if (ngx_is_dir((&r->file.info))) {
+ if (ngx_is_dir(&r->file.info)) {
return NGX_OK;
}
diff --git a/src/http/modules/ngx_http_static_handler.c b/src/http/modules/ngx_http_static_handler.c
index 8b622a0f3..c92287082 100644
--- a/src/http/modules/ngx_http_static_handler.c
+++ b/src/http/modules/ngx_http_static_handler.c
@@ -95,10 +95,10 @@ ngx_log_debug(r->connection->log, "HTTP filename: '%s'" _ r->file.name.data);
* so we need to check its type before the opening
*/
- if (ngx_file_type(r->file.name.data, &r->file.info) == NGX_FILE_ERROR) {
+ if (ngx_file_info(r->file.name.data, &r->file.info) == NGX_FILE_ERROR) {
err = ngx_errno;
ngx_log_error(NGX_LOG_ERR, r->connection->log, err,
- ngx_file_type_n " \"%s\" failed", r->file.name.data);
+ ngx_file_info_n " \"%s\" failed", r->file.name.data);
if (err == NGX_ENOENT || err == NGX_ENOTDIR) {
return NGX_HTTP_NOT_FOUND;
@@ -111,7 +111,7 @@ ngx_log_debug(r->connection->log, "HTTP filename: '%s'" _ r->file.name.data);
}
}
- if (ngx_is_dir(r->file.info)) {
+ if (ngx_is_dir(&r->file.info)) {
ngx_log_debug(r->connection->log, "HTTP DIR: '%s'" _ r->file.name.data);
if (!(r->headers_out.location =
@@ -163,9 +163,9 @@ ngx_log_debug(r->connection->log, "HTTP DIR: '%s'" _ r->file.name.data);
ngx_log_debug(r->connection->log, "FILE: %d" _ r->file.fd);
if (!r->file.info_valid) {
- if (ngx_stat_fd(r->file.fd, &r->file.info) == NGX_FILE_ERROR) {
+ if (ngx_fd_info(r->file.fd, &r->file.info) == NGX_FILE_ERROR) {
ngx_log_error(NGX_LOG_CRIT, r->connection->log, ngx_errno,
- ngx_stat_fd_n " \"%s\" failed", r->file.name.data);
+ ngx_fd_info_n " \"%s\" failed", r->file.name.data);
if (ngx_close_file(r->file.fd) == NGX_FILE_ERROR) {
ngx_log_error(NGX_LOG_ALERT, r->connection->log, ngx_errno,
@@ -181,7 +181,7 @@ ngx_log_debug(r->connection->log, "FILE: %d" _ r->file.fd);
r->file.info_valid = 1;
}
- if (ngx_is_dir((&r->file.info))) {
+ if (ngx_is_dir(&r->file.info)) {
ngx_log_debug(r->connection->log, "HTTP DIR: '%s'" _ r->file.name.data);
if (ngx_close_file(r->file.fd) == NGX_FILE_ERROR) {
@@ -210,7 +210,7 @@ ngx_log_debug(r->connection->log, "HTTP DIR: '%s'" _ r->file.name.data);
#if !(WIN32) /* the not regular files are probably Unix specific */
- if (!ngx_is_file((&r->file.info))) {
+ if (!ngx_is_file(&r->file.info)) {
ngx_log_error(NGX_LOG_CRIT, r->connection->log, ngx_errno,
"%s is not a regular file", r->file.name.data);
@@ -272,9 +272,9 @@ static int ngx_http_static_handler(ngx_http_request_t *r)
}
if (!r->file.info_valid) {
- if (ngx_stat_fd(r->file.fd, &r->file.info) == NGX_FILE_ERROR) {
+ if (ngx_fd_info(r->file.fd, &r->file.info) == NGX_FILE_ERROR) {
ngx_log_error(NGX_LOG_CRIT, r->connection->log, ngx_errno,
- ngx_stat_fd_n " %s failed", r->file.name.data);
+ ngx_fd_info_n " %s failed", r->file.name.data);
if (ngx_close_file(r->file.fd) == NGX_FILE_ERROR)
ngx_log_error(NGX_LOG_ALERT, r->connection->log, ngx_errno,
@@ -287,8 +287,8 @@ static int ngx_http_static_handler(ngx_http_request_t *r)
}
r->headers_out.status = NGX_HTTP_OK;
- r->headers_out.content_length_n = ngx_file_size((&r->file.info));
- r->headers_out.last_modified_time = ngx_file_mtime((&r->file.info));
+ r->headers_out.content_length_n = ngx_file_size(&r->file.info);
+ r->headers_out.last_modified_time = ngx_file_mtime(&r->file.info);
if (!(r->headers_out.content_type =
ngx_http_add_header(&r->headers_out, ngx_http_headers_out)))
@@ -344,7 +344,7 @@ static int ngx_http_static_handler(ngx_http_request_t *r)
h->type = r->main ? NGX_HUNK_FILE : NGX_HUNK_FILE|NGX_HUNK_LAST;
h->file_pos = 0;
- h->file_last = ngx_file_size((&r->file.info));
+ h->file_last = ngx_file_size(&r->file.info);
h->file->fd = r->file.fd;
h->file->log = r->connection->log;
diff --git a/src/http/modules/proxy/ngx_http_proxy_cache.c b/src/http/modules/proxy/ngx_http_proxy_cache.c
index e56c2e522..7c5ec595d 100644
--- a/src/http/modules/proxy/ngx_http_proxy_cache.c
+++ b/src/http/modules/proxy/ngx_http_proxy_cache.c
@@ -270,11 +270,11 @@ void ngx_http_proxy_cache_busy_lock(ngx_http_proxy_ctx_t *p)
if (p->cache->ctx.file.fd != NGX_INVALID_FILE
&& !p->cache->ctx.file.info_valid)
{
- if (ngx_stat_fd(p->cache->ctx.file.fd, &p->cache->ctx.file.info)
+ if (ngx_fd_info(p->cache->ctx.file.fd, &p->cache->ctx.file.info)
== NGX_FILE_ERROR)
{
ngx_log_error(NGX_LOG_CRIT, p->request->connection->log, ngx_errno,
- ngx_stat_fd_n " \"%s\" failed",
+ ngx_fd_info_n " \"%s\" failed",
p->cache->ctx.file.name.data);
ngx_http_proxy_finalize_request(p, NGX_HTTP_INTERNAL_SERVER_ERROR);
return;
@@ -322,7 +322,7 @@ static void ngx_http_proxy_cache_look_complete_request(ngx_http_proxy_ctx_t *p)
*ctx = p->cache->ctx;
rc = ngx_http_cache_open_file(p->request, ctx,
- ngx_file_uniq((&p->cache->ctx.file.info)));
+ ngx_file_uniq(&p->cache->ctx.file.info));
if (rc == NGX_HTTP_CACHE_THE_SAME) {
p->try_busy_lock = 1;
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-16 18:05:38 +0000