Mercurial > hg > nginx-quic
view auto/lib/perl/conf @ 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 | 0d2956dfc4e6 |
children | 30b6f1ff192b |
line wrap: on
line source
# Copyright (C) Igor Sysoev # Copyright (C) Nginx, Inc. echo "checking for perl" NGX_PERL_VER=`$NGX_PERL -v 2>&1 | grep '^This is perl' 2>&1 \ | sed -e 's/^This is perl, \(.*\)/\1/'` if test -n "$NGX_PERL_VER"; then echo " + perl version: $NGX_PERL_VER" if [ "`$NGX_PERL -e 'use 5.006001; print "OK"'`" != "OK" ]; then echo echo "$0: error: perl 5.6.1 or higher is required" echo exit 1; fi if [ "`$NGX_PERL -MExtUtils::Embed -e 'print "OK"'`" != "OK" ]; then echo echo "$0: error: perl module ExtUtils::Embed is required" echo exit 1; fi NGX_PM_CFLAGS=`$NGX_PERL -MExtUtils::Embed -e ccopts` NGX_PM_LDFLAGS=`$NGX_PERL -MConfig -e 'print $Config{lddlflags}'` NGX_PERL_CFLAGS="$CFLAGS `$NGX_PERL -MExtUtils::Embed -e ccopts`" # gcc 4.1/4.2 warn about unused values in pTHX_ NGX_PERL_CFLAGS=`echo $NGX_PERL_CFLAGS \ | sed -e 's/-Wunused-value/-Wno-unused-value/'` # icc8 warns 'declaration hides parameter "my_perl"' in ENTER and LEAVE NGX_PERL_CFLAGS=`echo $NGX_PERL_CFLAGS \ | sed -e 's/-wd171/-wd171 -wd1599/'` ngx_perl_ldopts=`$NGX_PERL -MExtUtils::Embed -e ldopts` ngx_perl_dlext=`$NGX_PERL -MConfig -e 'print $Config{dlext}'` ngx_perl_libdir="src/http/modules/perl/blib/arch/auto" ngx_perl_module="$ngx_perl_libdir/nginx/nginx.$ngx_perl_dlext" if $NGX_PERL -V:usemultiplicity | grep define > /dev/null; then have=NGX_HAVE_PERL_MULTIPLICITY . auto/have echo " + perl interpreter multiplicity found" fi if $NGX_PERL -V:useithreads | grep undef > /dev/null; then # FreeBSD port wants to link with -pthread non-threaded perl ngx_perl_ldopts=`echo $ngx_perl_ldopts | sed 's/ -pthread//'` fi if [ "$NGX_SYSTEM" = "Darwin" ]; then # OS X system perl wants to link universal binaries ngx_perl_ldopts=`echo $ngx_perl_ldopts \ | sed -e 's/-arch i386//' -e 's/-arch x86_64//'` fi if [ $USE_PERL = YES ]; then CORE_LINK="$CORE_LINK $ngx_perl_ldopts" fi NGX_LIB_PERL="$ngx_perl_ldopts" if test -n "$NGX_PERL_MODULES"; then have=NGX_PERL_MODULES value="(u_char *) \"$NGX_PERL_MODULES\"" . auto/define NGX_PERL_MODULES_MAN=$NGX_PERL_MODULES/man3 fi else echo echo "$0: error: perl 5.6.1 or higher is required" echo exit 1; fi