Mercurial > hg > nginx-quic
annotate auto/lib/google-perftools/conf @ 8253:7a55311b0dc3
Fixed double close of non-regular files in flv and mp4.
With introduction of open_file_cache in 1454:f497ed7682a7, opening a file
with ngx_open_cached_file() automatically adds a cleanup handler to close
the file. As such, calling ngx_close_file() directly for non-regular files
is no longer needed and will result in duplicate close() call.
In 1454:f497ed7682a7 ngx_close_file() call for non-regular files was removed
in the static module, but wasn't in the flv module. And the resulting
incorrect code was later copied to the mp4 module. Fix is to remove the
ngx_close_file() call from both modules.
Reported by Chris Newton.
author | Maxim Dounin <mdounin@mdounin.ru> |
---|---|
date | Fri, 11 Dec 2020 13:42:07 +0300 |
parents | f7e79596baf2 |
children |
rev | line source |
---|---|
1949 | 1 |
2 # Copyright (C) Igor Sysoev | |
4412 | 3 # Copyright (C) Nginx, Inc. |
1949 | 4 |
5 | |
6 ngx_feature="Google perftools" | |
7 ngx_feature_name= | |
8 ngx_feature_run=no | |
9 ngx_feature_incs= | |
10 ngx_feature_path= | |
11 ngx_feature_libs="-lprofiler" | |
7327
f7e79596baf2
Configure: fixed compiler warnings with "-Wall -Wextra".
Sergey Kandaurov <pluknet@nginx.com>
parents:
5678
diff
changeset
|
12 ngx_feature_test="void ProfilerStop(void); |
f7e79596baf2
Configure: fixed compiler warnings with "-Wall -Wextra".
Sergey Kandaurov <pluknet@nginx.com>
parents:
5678
diff
changeset
|
13 ProfilerStop()" |
1949 | 14 . auto/feature |
15 | |
16 | |
17 if [ $ngx_found = no ]; then | |
18 | |
19 # FreeBSD port | |
20 | |
21 ngx_feature="Google perftools in /usr/local/" | |
22 | |
23 if [ $NGX_RPATH = YES ]; then | |
24 ngx_feature_libs="-R/usr/local/lib -L/usr/local/lib -lprofiler" | |
25 else | |
26 ngx_feature_libs="-L/usr/local/lib -lprofiler" | |
27 fi | |
28 | |
29 . auto/feature | |
30 fi | |
31 | |
32 | |
4704
642755ee3fab
Added code to look up Google perftools in /opt/local/, for MacPorts.
Ruslan Ermilov <ru@nginx.com>
parents:
4412
diff
changeset
|
33 if [ $ngx_found = no ]; then |
642755ee3fab
Added code to look up Google perftools in /opt/local/, for MacPorts.
Ruslan Ermilov <ru@nginx.com>
parents:
4412
diff
changeset
|
34 |
642755ee3fab
Added code to look up Google perftools in /opt/local/, for MacPorts.
Ruslan Ermilov <ru@nginx.com>
parents:
4412
diff
changeset
|
35 # MacPorts |
642755ee3fab
Added code to look up Google perftools in /opt/local/, for MacPorts.
Ruslan Ermilov <ru@nginx.com>
parents:
4412
diff
changeset
|
36 |
642755ee3fab
Added code to look up Google perftools in /opt/local/, for MacPorts.
Ruslan Ermilov <ru@nginx.com>
parents:
4412
diff
changeset
|
37 ngx_feature="Google perftools in /opt/local/" |
642755ee3fab
Added code to look up Google perftools in /opt/local/, for MacPorts.
Ruslan Ermilov <ru@nginx.com>
parents:
4412
diff
changeset
|
38 |
642755ee3fab
Added code to look up Google perftools in /opt/local/, for MacPorts.
Ruslan Ermilov <ru@nginx.com>
parents:
4412
diff
changeset
|
39 if [ $NGX_RPATH = YES ]; then |
642755ee3fab
Added code to look up Google perftools in /opt/local/, for MacPorts.
Ruslan Ermilov <ru@nginx.com>
parents:
4412
diff
changeset
|
40 ngx_feature_libs="-R/opt/local/lib -L/opt/local/lib -lprofiler" |
642755ee3fab
Added code to look up Google perftools in /opt/local/, for MacPorts.
Ruslan Ermilov <ru@nginx.com>
parents:
4412
diff
changeset
|
41 else |
642755ee3fab
Added code to look up Google perftools in /opt/local/, for MacPorts.
Ruslan Ermilov <ru@nginx.com>
parents:
4412
diff
changeset
|
42 ngx_feature_libs="-L/opt/local/lib -lprofiler" |
642755ee3fab
Added code to look up Google perftools in /opt/local/, for MacPorts.
Ruslan Ermilov <ru@nginx.com>
parents:
4412
diff
changeset
|
43 fi |
642755ee3fab
Added code to look up Google perftools in /opt/local/, for MacPorts.
Ruslan Ermilov <ru@nginx.com>
parents:
4412
diff
changeset
|
44 |
642755ee3fab
Added code to look up Google perftools in /opt/local/, for MacPorts.
Ruslan Ermilov <ru@nginx.com>
parents:
4412
diff
changeset
|
45 . auto/feature |
642755ee3fab
Added code to look up Google perftools in /opt/local/, for MacPorts.
Ruslan Ermilov <ru@nginx.com>
parents:
4412
diff
changeset
|
46 fi |
642755ee3fab
Added code to look up Google perftools in /opt/local/, for MacPorts.
Ruslan Ermilov <ru@nginx.com>
parents:
4412
diff
changeset
|
47 |
642755ee3fab
Added code to look up Google perftools in /opt/local/, for MacPorts.
Ruslan Ermilov <ru@nginx.com>
parents:
4412
diff
changeset
|
48 |
1949 | 49 if [ $ngx_found = yes ]; then |
50 CORE_LIBS="$CORE_LIBS $ngx_feature_libs" | |
2893
da1ba8a5c8c9
stop ./configure at once on library failure
Igor Sysoev <igor@sysoev.ru>
parents:
1949
diff
changeset
|
51 |
da1ba8a5c8c9
stop ./configure at once on library failure
Igor Sysoev <igor@sysoev.ru>
parents:
1949
diff
changeset
|
52 else |
da1ba8a5c8c9
stop ./configure at once on library failure
Igor Sysoev <igor@sysoev.ru>
parents:
1949
diff
changeset
|
53 |
da1ba8a5c8c9
stop ./configure at once on library failure
Igor Sysoev <igor@sysoev.ru>
parents:
1949
diff
changeset
|
54 cat << END |
da1ba8a5c8c9
stop ./configure at once on library failure
Igor Sysoev <igor@sysoev.ru>
parents:
1949
diff
changeset
|
55 |
5678 | 56 $0: error: the Google perftools module requires the Google perftools |
2893
da1ba8a5c8c9
stop ./configure at once on library failure
Igor Sysoev <igor@sysoev.ru>
parents:
1949
diff
changeset
|
57 library. You can either do not enable the module or install the library. |
da1ba8a5c8c9
stop ./configure at once on library failure
Igor Sysoev <igor@sysoev.ru>
parents:
1949
diff
changeset
|
58 |
da1ba8a5c8c9
stop ./configure at once on library failure
Igor Sysoev <igor@sysoev.ru>
parents:
1949
diff
changeset
|
59 END |
da1ba8a5c8c9
stop ./configure at once on library failure
Igor Sysoev <igor@sysoev.ru>
parents:
1949
diff
changeset
|
60 |
da1ba8a5c8c9
stop ./configure at once on library failure
Igor Sysoev <igor@sysoev.ru>
parents:
1949
diff
changeset
|
61 exit 1 |
1949 | 62 fi |