Mercurial > hg > nginx
comparison src/http/ngx_http_request.c @ 4732:613390a974df stable-1.2
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.
| author | Maxim Dounin <mdounin@mdounin.ru> |
|---|---|
| date | Mon, 02 Jul 2012 17:41:52 +0000 |
| parents | 01dbbe7236ee |
| children | 179a4d4073b3 |
comparison
equal
deleted
inserted
replaced
| 4731:9efa21520c84 | 4732:613390a974df |
|---|---|
| 136 ngx_http_process_unique_header_line }, | 136 ngx_http_process_unique_header_line }, |
| 137 | 137 |
| 138 { ngx_string("Keep-Alive"), offsetof(ngx_http_headers_in_t, keep_alive), | 138 { ngx_string("Keep-Alive"), offsetof(ngx_http_headers_in_t, keep_alive), |
| 139 ngx_http_process_header_line }, | 139 ngx_http_process_header_line }, |
| 140 | 140 |
| 141 #if (NGX_HTTP_PROXY || NGX_HTTP_REALIP || NGX_HTTP_GEO) | 141 #if (NGX_HTTP_X_FORWARDED_FOR) |
| 142 { ngx_string("X-Forwarded-For"), | 142 { ngx_string("X-Forwarded-For"), |
| 143 offsetof(ngx_http_headers_in_t, x_forwarded_for), | 143 offsetof(ngx_http_headers_in_t, x_forwarded_for), |
| 144 ngx_http_process_header_line }, | 144 ngx_http_process_header_line }, |
| 145 #endif | 145 #endif |
| 146 | 146 |