diff options
| author | Maxim Dounin <mdounin@mdounin.ru> | 2012-07-02 17:41:52 +0000 |
|---|---|---|
| committer | Maxim Dounin <mdounin@mdounin.ru> | 2012-07-02 17:41:52 +0000 |
| commit | 92486bd9cc307ea6f78442231c8f7d101e567969 (patch) | |
| tree | 4d4a702d3c883017348a429e08608b6f6b10f033 /src/http/ngx_http_request.c | |
| parent | d4ee957632ed27aa26e1351cb3a3bb400fac30d1 (diff) | |
| download | nginx-92486bd9cc307ea6f78442231c8f7d101e567969.tar.gz nginx-92486bd9cc307ea6f78442231c8f7d101e567969.zip | |
Merge of r4698: X-Forwarded-For conditionals.
Fixed compile-time conditionals used to detect if X-Forwarded-For support
is needed.
Note: compatibility shims were added during merge to avoid possible
breakage of 3rd party modules. At least cache purge module was broken
by the original commit, as it used to rely on NGX_HTTP_PROXY define.
Diffstat (limited to 'src/http/ngx_http_request.c')
| -rw-r--r-- | src/http/ngx_http_request.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/http/ngx_http_request.c b/src/http/ngx_http_request.c index b1877131c..e0ae5241f 100644 --- a/src/http/ngx_http_request.c +++ b/src/http/ngx_http_request.c @@ -138,7 +138,7 @@ ngx_http_header_t ngx_http_headers_in[] = { { 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 }, |