Mercurial > hg > nginx-quic
view auto/lib/geoip/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 | a6d116645c51 |
children |
line wrap: on
line source
# Copyright (C) Igor Sysoev # Copyright (C) Nginx, Inc. ngx_feature="GeoIP library" ngx_feature_name= ngx_feature_run=no ngx_feature_incs="#include <GeoIP.h>" ngx_feature_path= ngx_feature_libs="-lGeoIP" ngx_feature_test="GeoIP_open(NULL, 0)" . auto/feature if [ $ngx_found = no ]; then # FreeBSD port ngx_feature="GeoIP library in /usr/local/" ngx_feature_path="/usr/local/include" if [ $NGX_RPATH = YES ]; then ngx_feature_libs="-R/usr/local/lib -L/usr/local/lib -lGeoIP" else ngx_feature_libs="-L/usr/local/lib -lGeoIP" fi . auto/feature fi if [ $ngx_found = no ]; then # NetBSD port ngx_feature="GeoIP library in /usr/pkg/" ngx_feature_path="/usr/pkg/include" if [ $NGX_RPATH = YES ]; then ngx_feature_libs="-R/usr/pkg/lib -L/usr/pkg/lib -lGeoIP" else ngx_feature_libs="-L/usr/pkg/lib -lGeoIP" fi . auto/feature fi if [ $ngx_found = no ]; then # MacPorts ngx_feature="GeoIP library in /opt/local/" ngx_feature_path="/opt/local/include" if [ $NGX_RPATH = YES ]; then ngx_feature_libs="-R/opt/local/lib -L/opt/local/lib -lGeoIP" else ngx_feature_libs="-L/opt/local/lib -lGeoIP" fi . auto/feature fi if [ $ngx_found = yes ]; then CORE_INCS="$CORE_INCS $ngx_feature_path" if [ $USE_GEOIP = YES ]; then CORE_LIBS="$CORE_LIBS $ngx_feature_libs" fi NGX_LIB_GEOIP=$ngx_feature_libs ngx_feature="GeoIP IPv6 support" ngx_feature_name="NGX_HAVE_GEOIP_V6" ngx_feature_run=no ngx_feature_incs="#include <stdio.h> #include <GeoIP.h>" #ngx_feature_path= #ngx_feature_libs= ngx_feature_test="printf(\"%d\", GEOIP_CITY_EDITION_REV0_V6);" . auto/feature else cat << END $0: error: the GeoIP module requires the GeoIP library. You can either do not enable the module or install the library. END exit 1 fi