Mercurial > hg > nginx
annotate src/os/unix/ngx_time.c @ 9300:5be23505292b
SSI: fixed incorrect or duplicate stub output.
Following 3518:eb3aaf8bd2a9 (0.8.37), r->request_output is only set
if there are data in the first buffer sent in the subrequest. As a
result, following the change mentioned this flag cannot be used to
prevent duplicate ngx_http_ssi_stub_output() calls, since it is not
set if there was already some output, but the first buffer was empty.
Still, when there are multiple subrequests, even an empty subrequest
response might be delayed by the postpone filter, leading to a second
call of ngx_http_ssi_stub_output() during finalization from
ngx_http_writer() the subreqest buffers are released by the postpone
filter. Since r->request_output is not set after the first call, this
resulted in duplicate stub output.
Additionally, checking only the first buffer might be wrong in some
unusual cases. For example, the first buffer might be empty if
$r->flush() is called before printing any data in the embedded Perl
module.
Depending on the postpone_output value and corresponding sizes, this
issue can result in either duplicate or unexpected stub output, or
"zero size buf in writer" alerts.
Following 8124:f5515e727656 (1.23.4), it became slightly easier to
reproduce the issue, as empty static files and empty cache items now
result in a response with an empty buffer. Before the change, an empty
proxied response can be used to reproduce the issue.
Fix is check all buffers and set r->request_output if any non-empty
buffers are sent. This ensures that all unusual cases of non-empty
responses are covered, and also that r->request_output will be set
after the first stub output, preventing duplicate output.
Reported by Jan Gassen.
author | Maxim Dounin <mdounin@mdounin.ru> |
---|---|
date | Thu, 04 Jul 2024 17:41:28 +0300 |
parents | d620f497c50f |
children |
rev | line source |
---|---|
441
da8c5707af39
nginx-0.1.0-2004-09-28-12:34:51 import; set copyright and remove unused files
Igor Sysoev <igor@sysoev.ru>
parents:
370
diff
changeset
|
1 |
da8c5707af39
nginx-0.1.0-2004-09-28-12:34:51 import; set copyright and remove unused files
Igor Sysoev <igor@sysoev.ru>
parents:
370
diff
changeset
|
2 /* |
444
42d11f017717
nginx-0.1.0-2004-09-29-20:00:49 import; remove years from copyright
Igor Sysoev <igor@sysoev.ru>
parents:
441
diff
changeset
|
3 * Copyright (C) Igor Sysoev |
4412 | 4 * Copyright (C) Nginx, Inc. |
441
da8c5707af39
nginx-0.1.0-2004-09-28-12:34:51 import; set copyright and remove unused files
Igor Sysoev <igor@sysoev.ru>
parents:
370
diff
changeset
|
5 */ |
da8c5707af39
nginx-0.1.0-2004-09-28-12:34:51 import; set copyright and remove unused files
Igor Sysoev <igor@sysoev.ru>
parents:
370
diff
changeset
|
6 |
0
4eff17414a43
nginx-0.0.1-2002-08-06-20:39:45 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
7 |
4eff17414a43
nginx-0.0.1-2002-08-06-20:39:45 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
8 #include <ngx_config.h> |
178
a8ff48d26cca
nginx-0.0.1-2003-11-11-00:09:22 import
Igor Sysoev <igor@sysoev.ru>
parents:
95
diff
changeset
|
9 #include <ngx_core.h> |
a8ff48d26cca
nginx-0.0.1-2003-11-11-00:09:22 import
Igor Sysoev <igor@sysoev.ru>
parents:
95
diff
changeset
|
10 |
0
4eff17414a43
nginx-0.0.1-2002-08-06-20:39:45 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
11 |
2220 | 12 /* |
13 * FreeBSD does not test /etc/localtime change, however, we can workaround it | |
14 * by calling tzset() with TZ and then without TZ to update timezone. | |
15 * The trick should work since FreeBSD 2.1.0. | |
16 * | |
17 * Linux does not test /etc/localtime change in localtime(), | |
18 * but may stat("/etc/localtime") several times in every strftime(), | |
19 * therefore we use it to update timezone. | |
20 * | |
21 * Solaris does not test /etc/TIMEZONE change too and no workaround available. | |
22 */ | |
23 | |
24 void | |
25 ngx_timezone_update(void) | |
26 { | |
27 #if (NGX_FREEBSD) | |
28 | |
29 if (getenv("TZ")) { | |
30 return; | |
31 } | |
32 | |
33 putenv("TZ=UTC"); | |
34 | |
35 tzset(); | |
36 | |
37 unsetenv("TZ"); | |
38 | |
39 tzset(); | |
40 | |
41 #elif (NGX_LINUX) | |
42 time_t s; | |
43 struct tm *t; | |
44 char buf[4]; | |
45 | |
46 s = time(0); | |
47 | |
48 t = localtime(&s); | |
49 | |
50 strftime(buf, 4, "%H", t); | |
51 | |
52 #endif | |
53 } | |
54 | |
55 | |
563 | 56 void |
57 ngx_localtime(time_t s, ngx_tm_t *tm) | |
0
4eff17414a43
nginx-0.0.1-2002-08-06-20:39:45 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
58 { |
469 | 59 #if (NGX_HAVE_LOCALTIME_R) |
563 | 60 (void) localtime_r(&s, tm); |
178
a8ff48d26cca
nginx-0.0.1-2003-11-11-00:09:22 import
Igor Sysoev <igor@sysoev.ru>
parents:
95
diff
changeset
|
61 |
179
9f3a78b06c48
nginx-0.0.1-2003-11-11-21:13:43 import
Igor Sysoev <igor@sysoev.ru>
parents:
178
diff
changeset
|
62 #else |
9f3a78b06c48
nginx-0.0.1-2003-11-11-21:13:43 import
Igor Sysoev <igor@sysoev.ru>
parents:
178
diff
changeset
|
63 ngx_tm_t *t; |
9f3a78b06c48
nginx-0.0.1-2003-11-11-21:13:43 import
Igor Sysoev <igor@sysoev.ru>
parents:
178
diff
changeset
|
64 |
563 | 65 t = localtime(&s); |
179
9f3a78b06c48
nginx-0.0.1-2003-11-11-21:13:43 import
Igor Sysoev <igor@sysoev.ru>
parents:
178
diff
changeset
|
66 *tm = *t; |
9f3a78b06c48
nginx-0.0.1-2003-11-11-21:13:43 import
Igor Sysoev <igor@sysoev.ru>
parents:
178
diff
changeset
|
67 |
9f3a78b06c48
nginx-0.0.1-2003-11-11-21:13:43 import
Igor Sysoev <igor@sysoev.ru>
parents:
178
diff
changeset
|
68 #endif |
9f3a78b06c48
nginx-0.0.1-2003-11-11-21:13:43 import
Igor Sysoev <igor@sysoev.ru>
parents:
178
diff
changeset
|
69 |
28
a117a7fdf042
nginx-0.0.1-2002-12-16-00:08:04 import
Igor Sysoev <igor@sysoev.ru>
parents:
1
diff
changeset
|
70 tm->ngx_tm_mon++; |
a117a7fdf042
nginx-0.0.1-2002-12-16-00:08:04 import
Igor Sysoev <igor@sysoev.ru>
parents:
1
diff
changeset
|
71 tm->ngx_tm_year += 1900; |
0
4eff17414a43
nginx-0.0.1-2002-08-06-20:39:45 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
72 } |
509 | 73 |
74 | |
563 | 75 void |
76 ngx_libc_localtime(time_t s, struct tm *tm) | |
509 | 77 { |
78 #if (NGX_HAVE_LOCALTIME_R) | |
563 | 79 (void) localtime_r(&s, tm); |
509 | 80 |
81 #else | |
82 struct tm *t; | |
83 | |
563 | 84 t = localtime(&s); |
509 | 85 *tm = *t; |
86 | |
87 #endif | |
88 } | |
89 | |
90 | |
563 | 91 void |
92 ngx_libc_gmtime(time_t s, struct tm *tm) | |
509 | 93 { |
94 #if (NGX_HAVE_LOCALTIME_R) | |
563 | 95 (void) gmtime_r(&s, tm); |
509 | 96 |
97 #else | |
98 struct tm *t; | |
99 | |
563 | 100 t = gmtime(&s); |
509 | 101 *tm = *t; |
102 | |
103 #endif | |
104 } |