Mercurial > hg > nginx
changeset 4697:09187f9b0950
Fixed compile-time conditionals used to detect if X-Forwarded-For support
is needed.
author | Ruslan Ermilov <ru@nginx.com> |
---|---|
date | Thu, 21 Jun 2012 11:02:22 +0000 |
parents | b43fe2deb053 |
children | 4c415af7dbc2 |
files | auto/modules src/http/ngx_http_request.c src/http/ngx_http_request.h src/http/ngx_http_variables.c |
diffstat | 4 files changed, 7 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/auto/modules Wed Jun 20 12:55:28 2012 +0000 +++ b/auto/modules Thu Jun 21 11:02:22 2012 +0000 @@ -223,6 +223,7 @@ if [ $HTTP_REALIP = YES ]; then have=NGX_HTTP_REALIP . auto/have + have=NGX_HTTP_X_FORWARDED_FOR . auto/have HTTP_MODULES="$HTTP_MODULES $HTTP_REALIP_MODULE" HTTP_SRCS="$HTTP_SRCS $HTTP_REALIP_SRCS" fi @@ -233,12 +234,13 @@ fi if [ $HTTP_GEO = YES ]; then - have=NGX_HTTP_GEO . auto/have + have=NGX_HTTP_X_FORWARDED_FOR . auto/have HTTP_MODULES="$HTTP_MODULES $HTTP_GEO_MODULE" HTTP_SRCS="$HTTP_SRCS $HTTP_GEO_SRCS" fi if [ $HTTP_GEOIP = YES ]; then + have=NGX_HTTP_X_FORWARDED_FOR . auto/have HTTP_MODULES="$HTTP_MODULES $HTTP_GEOIP_MODULE" HTTP_SRCS="$HTTP_SRCS $HTTP_GEOIP_SRCS" fi @@ -273,7 +275,7 @@ fi if [ $HTTP_PROXY = YES ]; then - have=NGX_HTTP_PROXY . auto/have + have=NGX_HTTP_X_FORWARDED_FOR . auto/have #USE_MD5=YES HTTP_MODULES="$HTTP_MODULES $HTTP_PROXY_MODULE" HTTP_DEPS="$HTTP_DEPS $HTTP_PROXY_DEPS"
--- a/src/http/ngx_http_request.c Wed Jun 20 12:55:28 2012 +0000 +++ b/src/http/ngx_http_request.c Thu Jun 21 11:02:22 2012 +0000 @@ -138,7 +138,7 @@ { ngx_string("Keep-Alive"), offsetof(ngx_http_headers_in_t, keep_alive), ngx_http_process_header_line }, -#if (NGX_HTTP_PROXY || NGX_HTTP_REALIP || NGX_HTTP_GEO) +#if (NGX_HTTP_X_FORWARDED_FOR) { ngx_string("X-Forwarded-For"), offsetof(ngx_http_headers_in_t, x_forwarded_for), ngx_http_process_header_line },
--- a/src/http/ngx_http_request.h Wed Jun 20 12:55:28 2012 +0000 +++ b/src/http/ngx_http_request.h Thu Jun 21 11:02:22 2012 +0000 @@ -192,7 +192,7 @@ ngx_table_elt_t *keep_alive; -#if (NGX_HTTP_PROXY || NGX_HTTP_REALIP || NGX_HTTP_GEO) +#if (NGX_HTTP_X_FORWARDED_FOR) ngx_table_elt_t *x_forwarded_for; #endif
--- a/src/http/ngx_http_variables.c Wed Jun 20 12:55:28 2012 +0000 +++ b/src/http/ngx_http_variables.c Thu Jun 21 11:02:22 2012 +0000 @@ -134,7 +134,7 @@ offsetof(ngx_http_request_t, headers_in.via), 0, 0 }, #endif -#if (NGX_HTTP_PROXY || NGX_HTTP_REALIP) +#if (NGX_HTTP_X_FORWARDED_FOR) { ngx_string("http_x_forwarded_for"), NULL, ngx_http_variable_header, offsetof(ngx_http_request_t, headers_in.x_forwarded_for), 0, 0 }, #endif