Mercurial > hg > nginx-quic
annotate auto/cc/bcc @ 6785:d1d0dd69a419
Upstream: added the ngx_http_upstream_resolved_t.name field.
This fixes inconsistency in what is stored in the "host" field.
Normally it would contain the "host" part of the parsed URL
(e.g., proxy_pass with variables), but for the case of an
implicit upstream specified with literal address it contained
the text representation of the socket address (that is, host
including port for IP).
Now the "host" field always contains the "host" part of the URL,
while the text representation of the socket address is stored
in the newly added "name" field.
The ngx_http_upstream_create_round_robin_peer() function was
modified accordingly in a way to be compatible with the code
that does not know about the new "name" field.
The "stream" code was similarly modified except for not adding
compatibility in ngx_stream_upstream_create_round_robin_peer().
This change is also a prerequisite for the next change.
author | Ruslan Ermilov <ru@nginx.com> |
---|---|
date | Mon, 31 Oct 2016 18:33:33 +0300 |
parents | d620f497c50f |
children | b7b7f3a0cc28 |
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" | |
65 ngx_binext=".exe" | |
461 | 66 |
573 | 67 ngx_long_start='@&&| |
68 ' | |
69 ngx_long_end='|' | |
70 | |
461 | 71 ngx_regex_dirsep='\\' |
72 ngx_dirsep="\\" |