Mercurial > hg > nginx
annotate src/os/win32/ngx_thread.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 | 537259db5af4 |
children |
rev | line source |
---|---|
461 | 1 |
2 /* | |
3 * Copyright (C) Igor Sysoev | |
4412 | 4 * Copyright (C) Nginx, Inc. |
461 | 5 */ |
6 | |
7 | |
8 #include <ngx_config.h> | |
9 #include <ngx_core.h> | |
10 | |
11 | |
563 | 12 ngx_err_t |
13 ngx_create_thread(ngx_tid_t *tid, | |
14 ngx_thread_value_t (__stdcall *func)(void *arg), void *arg, ngx_log_t *log) | |
461 | 15 { |
2725 | 16 u_long id; |
461 | 17 ngx_err_t err; |
18 | |
6111
537259db5af4
Removed "worker_threads" and "thread_stack_size" directives.
Ruslan Ermilov <ru@nginx.com>
parents:
6110
diff
changeset
|
19 *tid = CreateThread(NULL, 0, func, arg, 0, &id); |
461 | 20 |
21 if (*tid != NULL) { | |
2725 | 22 ngx_log_error(NGX_LOG_NOTICE, log, 0, |
23 "create thread " NGX_TID_T_FMT, id); | |
461 | 24 return 0; |
25 } | |
26 | |
27 err = ngx_errno; | |
28 ngx_log_error(NGX_LOG_ALERT, log, err, "CreateThread() failed"); | |
29 return err; | |
30 } |