Mercurial > hg > nginx
view src/os/unix/ngx_daemon.c @ 9295:c5623963c29e
Upstream: fixed proxy_no_cache when caching errors.
Caching errors, notably intercepted errors and internally generated
502/504 errors, as well as handling of cache revalidation with 304,
did not take into account u->conf->no_cache predicates configured.
As a result, an error might be cached even if configuration explicitly
says not to. Fix is to check u->conf->no_cache in these cases.
To simplify usage in multiple places, checking u->conf->no_cache is now
done in a separate function. As a minor optimization, u->conf->no_cache
is only checked if u->cacheable is set.
As a side effect, this change also fixes caching errors after
proxy_cache_bypass. Also, during cache revalidation u->cacheable is
now tested, so 304 responses which disable caching won't extend
cacheability of stored responses.
Additionally, when caching internally generated 502/504 errors
u->cacheable is now explicitly updated from u->headers_in.no_cache and
u->headers_in.expired, restoring the behaviour before 8041:0784ab86ad08
(1.23.0) when an error happens while reading the response headers.
Reported by Kirill A. Korinsky,
https://freenginx.org/pipermail/nginx/2024-April/000082.html
author | Maxim Dounin <mdounin@mdounin.ru> |
---|---|
date | Tue, 25 Jun 2024 21:44:50 +0300 |
parents | 3d455e37abf8 |
children |
line wrap: on
line source
/* * Copyright (C) Igor Sysoev * Copyright (C) Nginx, Inc. */ #include <ngx_config.h> #include <ngx_core.h> static ngx_fd_t ngx_daemon_fd = NGX_INVALID_FILE; ngx_int_t ngx_daemon(ngx_log_t *log) { u_char buf[1]; ssize_t n; ngx_fd_t fd, pp[2]; if (pipe(pp) == -1) { ngx_log_error(NGX_LOG_EMERG, log, ngx_errno, "pipe() failed"); return NGX_ERROR; } switch (fork()) { case -1: ngx_log_error(NGX_LOG_EMERG, log, ngx_errno, "fork() failed"); return NGX_ERROR; case 0: if (close(pp[0]) == -1) { ngx_log_error(NGX_LOG_EMERG, log, ngx_errno, "close() pipe failed"); return NGX_ERROR; } ngx_daemon_fd = pp[1]; break; default: if (close(pp[1]) == -1) { ngx_log_error(NGX_LOG_EMERG, log, ngx_errno, "close() pipe failed"); return NGX_ERROR; } n = read(pp[0], buf, 1); if (n == 0) { /* child exited */ return NGX_ERROR; } if (n != 1) { ngx_log_error(NGX_LOG_EMERG, log, ngx_errno, "read() pipe failed"); return NGX_ERROR; } if (close(pp[0]) == -1) { ngx_log_error(NGX_LOG_EMERG, log, ngx_errno, "close() pipe failed"); return NGX_ERROR; } exit(0); } ngx_parent = ngx_pid; ngx_pid = ngx_getpid(); if (setsid() == -1) { ngx_log_error(NGX_LOG_EMERG, log, ngx_errno, "setsid() failed"); return NGX_ERROR; } umask(0); fd = open("/dev/null", O_RDWR); if (fd == -1) { ngx_log_error(NGX_LOG_EMERG, log, ngx_errno, "open(\"/dev/null\") failed"); return NGX_ERROR; } if (dup2(fd, STDIN_FILENO) == -1) { ngx_log_error(NGX_LOG_EMERG, log, ngx_errno, "dup2(STDIN) failed"); return NGX_ERROR; } if (dup2(fd, STDOUT_FILENO) == -1) { ngx_log_error(NGX_LOG_EMERG, log, ngx_errno, "dup2(STDOUT) failed"); return NGX_ERROR; } #if 0 if (dup2(fd, STDERR_FILENO) == -1) { ngx_log_error(NGX_LOG_EMERG, log, ngx_errno, "dup2(STDERR) failed"); return NGX_ERROR; } #endif if (fd > STDERR_FILENO) { if (close(fd) == -1) { ngx_log_error(NGX_LOG_EMERG, log, ngx_errno, "close() failed"); return NGX_ERROR; } } return NGX_OK; } ngx_int_t ngx_daemon_sync(ngx_log_t *log) { if (ngx_daemon_fd == NGX_INVALID_FILE) { return NGX_OK; } if (write(ngx_daemon_fd, "", 1) != 1) { ngx_log_error(NGX_LOG_EMERG, log, ngx_errno, "write() pipe failed"); return NGX_ERROR; } if (close(ngx_daemon_fd) == -1) { ngx_log_error(NGX_LOG_EMERG, log, ngx_errno, "close() pipe failed"); return NGX_ERROR; } ngx_daemon_fd = NGX_INVALID_FILE; return NGX_OK; }