Mercurial > hg > nginx
annotate auto/cc/bcc @ 7098:7bfbf73db920
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 | b7b7f3a0cc28 |
children |
rev | line source |
---|---|
455 | 1 |
2 # Copyright (C) Igor Sysoev | |
4412 | 3 # Copyright (C) Nginx, Inc. |
455 | 4 |
5 | |
6 # Borland C++ 5.5 | |
7 | |
8 # optimizations | |
9 | |
10 # maximize speed | |
11 CFLAGS="$CFLAGS -O2" | |
12 | |
13 case $CPU in | |
14 pentium) | |
15 # optimize for Pentium and Athlon | |
16 CPU_OPT="-5" | |
17 ;; | |
18 | |
19 pentiumpro) | |
20 # optimize for Pentium Pro, Pentium II and Pentium III | |
21 CPU_OPT="-6" | |
22 ;; | |
23 esac | |
24 | |
503 | 25 # __stdcall |
26 #CPU_OPT="$CPU_OPT -ps" | |
27 # __fastcall | |
2712
41f993457021
OpenSSL building by MSVC and BCC from sources
Igor Sysoev <igor@sysoev.ru>
parents:
795
diff
changeset
|
28 #CPU_OPT="$CPU_OPT -pr" |
503 | 29 |
455 | 30 CFLAGS="$CFLAGS $CPU_OPT" |
31 | |
32 # multithreaded | |
33 CFLAGS="$CFLAGS -tWM" | |
34 | |
35 # stop on warning | |
36 CFLAGS="$CFLAGS -w!" | |
37 | |
38 # disable logo | |
39 CFLAGS="$CFLAGS -q" | |
40 | |
461 | 41 |
455 | 42 # precompiled headers |
795 | 43 CORE_DEPS="$CORE_DEPS $NGX_OBJS/ngx_config.csm" |
44 NGX_PCH="$NGX_OBJS/ngx_config.csm" | |
45 NGX_BUILD_PCH="-H=$NGX_OBJS/ngx_config.csm" | |
46 NGX_USE_PCH="-Hu -H=$NGX_OBJS/ngx_config.csm" | |
455 | 47 |
461 | 48 |
49 # Win32 GUI mode application | |
2725 | 50 #LINK="\$(CC) -laa" |
461 | 51 |
52 | |
53 # the resource file | |
469 | 54 NGX_RES="$NGX_OBJS/nginx.res" |
55 NGX_RCC="brcc32 -fo$NGX_OBJS/nginx.res \$(CORE_INCS) $NGX_WIN32_RC" | |
461 | 56 # the pragma allows to link the resource file using bcc32 and |
57 # to avoid the direct ilink32 calling and the c0w32.obj's WinMain/main problem | |
469 | 58 NGX_PRAGMA="#pragma resource \"$NGX_OBJS/nginx.res\"" |
461 | 59 |
455 | 60 |
61 ngx_include_opt="-I" | |
62 ngx_objout="-o" | |
63 ngx_binout="-e" | |
64 ngx_objext="obj" | |
461 | 65 |
573 | 66 ngx_long_start='@&&| |
67 ' | |
68 ngx_long_end='|' | |
69 | |
461 | 70 ngx_regex_dirsep='\\' |
71 ngx_dirsep="\\" |