Mercurial > hg > nginx-quic
annotate auto/lib/google-perftools/conf @ 7142:b9d919b53593 stable-1.12
Stream: relaxed next upstream condition (ticket #1317).
When switching to a next upstream, some buffers could be stuck in the middle
of the filter chain. A condition existed that raised an error when this
happened. As it turned out, this condition prevented switching to a next
upstream if ssl preread was used with the TCP protocol (see the ticket).
In fact, the condition does not make sense for TCP, since after successful
connection to an upstream switching to another upstream never happens. As for
UDP, the issue with stuck buffers is unlikely to happen, but is still possible.
Specifically, if a filter delays sending data to upstream.
The condition can be relaxed to only check the "buffered" bitmask of the
upstream connection. The new condition is simpler and fixes the ticket issue
as well. Additionally, the upstream_out chain is now reset for UDP prior to
connecting to a new upstream to prevent repeating the client data twice.
author | Roman Arutyunyan <arut@nginx.com> |
---|---|
date | Mon, 11 Sep 2017 15:32:31 +0300 |
parents | 0e1491139947 |
children | f7e79596baf2 |
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" | |
12 ngx_feature_test="ProfilerStop()" | |
13 . auto/feature | |
14 | |
15 | |
16 if [ $ngx_found = no ]; then | |
17 | |
18 # FreeBSD port | |
19 | |
20 ngx_feature="Google perftools in /usr/local/" | |
21 | |
22 if [ $NGX_RPATH = YES ]; then | |
23 ngx_feature_libs="-R/usr/local/lib -L/usr/local/lib -lprofiler" | |
24 else | |
25 ngx_feature_libs="-L/usr/local/lib -lprofiler" | |
26 fi | |
27 | |
28 . auto/feature | |
29 fi | |
30 | |
31 | |
4704
642755ee3fab
Added code to look up Google perftools in /opt/local/, for MacPorts.
Ruslan Ermilov <ru@nginx.com>
parents:
4412
diff
changeset
|
32 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
|
33 |
642755ee3fab
Added code to look up Google perftools in /opt/local/, for MacPorts.
Ruslan Ermilov <ru@nginx.com>
parents:
4412
diff
changeset
|
34 # MacPorts |
642755ee3fab
Added code to look up Google perftools in /opt/local/, for MacPorts.
Ruslan Ermilov <ru@nginx.com>
parents:
4412
diff
changeset
|
35 |
642755ee3fab
Added code to look up Google perftools in /opt/local/, for MacPorts.
Ruslan Ermilov <ru@nginx.com>
parents:
4412
diff
changeset
|
36 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
|
37 |
642755ee3fab
Added code to look up Google perftools in /opt/local/, for MacPorts.
Ruslan Ermilov <ru@nginx.com>
parents:
4412
diff
changeset
|
38 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
|
39 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
|
40 else |
642755ee3fab
Added code to look up Google perftools in /opt/local/, for MacPorts.
Ruslan Ermilov <ru@nginx.com>
parents:
4412
diff
changeset
|
41 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
|
42 fi |
642755ee3fab
Added code to look up Google perftools in /opt/local/, for MacPorts.
Ruslan Ermilov <ru@nginx.com>
parents:
4412
diff
changeset
|
43 |
642755ee3fab
Added code to look up Google perftools in /opt/local/, for MacPorts.
Ruslan Ermilov <ru@nginx.com>
parents:
4412
diff
changeset
|
44 . auto/feature |
642755ee3fab
Added code to look up Google perftools in /opt/local/, for MacPorts.
Ruslan Ermilov <ru@nginx.com>
parents:
4412
diff
changeset
|
45 fi |
642755ee3fab
Added code to look up Google perftools in /opt/local/, for MacPorts.
Ruslan Ermilov <ru@nginx.com>
parents:
4412
diff
changeset
|
46 |
642755ee3fab
Added code to look up Google perftools in /opt/local/, for MacPorts.
Ruslan Ermilov <ru@nginx.com>
parents:
4412
diff
changeset
|
47 |
1949 | 48 if [ $ngx_found = yes ]; then |
49 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
|
50 |
da1ba8a5c8c9
stop ./configure at once on library failure
Igor Sysoev <igor@sysoev.ru>
parents:
1949
diff
changeset
|
51 else |
da1ba8a5c8c9
stop ./configure at once on library failure
Igor Sysoev <igor@sysoev.ru>
parents:
1949
diff
changeset
|
52 |
da1ba8a5c8c9
stop ./configure at once on library failure
Igor Sysoev <igor@sysoev.ru>
parents:
1949
diff
changeset
|
53 cat << END |
da1ba8a5c8c9
stop ./configure at once on library failure
Igor Sysoev <igor@sysoev.ru>
parents:
1949
diff
changeset
|
54 |
5678 | 55 $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
|
56 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
|
57 |
da1ba8a5c8c9
stop ./configure at once on library failure
Igor Sysoev <igor@sysoev.ru>
parents:
1949
diff
changeset
|
58 END |
da1ba8a5c8c9
stop ./configure at once on library failure
Igor Sysoev <igor@sysoev.ru>
parents:
1949
diff
changeset
|
59 |
da1ba8a5c8c9
stop ./configure at once on library failure
Igor Sysoev <igor@sysoev.ru>
parents:
1949
diff
changeset
|
60 exit 1 |
1949 | 61 fi |