Mercurial > hg > nginx
comparison auto/modules @ 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 | 0141b4aec0e4 |
children |
comparison
equal
deleted
inserted
replaced
4731:9efa21520c84 | 4732:613390a974df |
---|---|
221 HTTP_SRCS="$HTTP_SRCS $HTTP_LIMIT_REQ_SRCS" | 221 HTTP_SRCS="$HTTP_SRCS $HTTP_LIMIT_REQ_SRCS" |
222 fi | 222 fi |
223 | 223 |
224 if [ $HTTP_REALIP = YES ]; then | 224 if [ $HTTP_REALIP = YES ]; then |
225 have=NGX_HTTP_REALIP . auto/have | 225 have=NGX_HTTP_REALIP . auto/have |
226 have=NGX_HTTP_X_FORWARDED_FOR . auto/have | |
226 HTTP_MODULES="$HTTP_MODULES $HTTP_REALIP_MODULE" | 227 HTTP_MODULES="$HTTP_MODULES $HTTP_REALIP_MODULE" |
227 HTTP_SRCS="$HTTP_SRCS $HTTP_REALIP_SRCS" | 228 HTTP_SRCS="$HTTP_SRCS $HTTP_REALIP_SRCS" |
228 fi | 229 fi |
229 | 230 |
230 if [ $HTTP_STATUS = YES ]; then | 231 if [ $HTTP_STATUS = YES ]; then |
232 HTTP_SRCS="$HTTP_SRCS $HTTP_STATUS_SRCS" | 233 HTTP_SRCS="$HTTP_SRCS $HTTP_STATUS_SRCS" |
233 fi | 234 fi |
234 | 235 |
235 if [ $HTTP_GEO = YES ]; then | 236 if [ $HTTP_GEO = YES ]; then |
236 have=NGX_HTTP_GEO . auto/have | 237 have=NGX_HTTP_GEO . auto/have |
238 have=NGX_HTTP_X_FORWARDED_FOR . auto/have | |
237 HTTP_MODULES="$HTTP_MODULES $HTTP_GEO_MODULE" | 239 HTTP_MODULES="$HTTP_MODULES $HTTP_GEO_MODULE" |
238 HTTP_SRCS="$HTTP_SRCS $HTTP_GEO_SRCS" | 240 HTTP_SRCS="$HTTP_SRCS $HTTP_GEO_SRCS" |
239 fi | 241 fi |
240 | 242 |
241 if [ $HTTP_GEOIP = YES ]; then | 243 if [ $HTTP_GEOIP = YES ]; then |
244 have=NGX_HTTP_X_FORWARDED_FOR . auto/have | |
242 HTTP_MODULES="$HTTP_MODULES $HTTP_GEOIP_MODULE" | 245 HTTP_MODULES="$HTTP_MODULES $HTTP_GEOIP_MODULE" |
243 HTTP_SRCS="$HTTP_SRCS $HTTP_GEOIP_SRCS" | 246 HTTP_SRCS="$HTTP_SRCS $HTTP_GEOIP_SRCS" |
244 fi | 247 fi |
245 | 248 |
246 if [ $HTTP_MAP = YES ]; then | 249 if [ $HTTP_MAP = YES ]; then |
272 HTTP_SRCS="$HTTP_SRCS $HTTP_SSL_SRCS" | 275 HTTP_SRCS="$HTTP_SRCS $HTTP_SSL_SRCS" |
273 fi | 276 fi |
274 | 277 |
275 if [ $HTTP_PROXY = YES ]; then | 278 if [ $HTTP_PROXY = YES ]; then |
276 have=NGX_HTTP_PROXY . auto/have | 279 have=NGX_HTTP_PROXY . auto/have |
280 have=NGX_HTTP_X_FORWARDED_FOR . auto/have | |
277 #USE_MD5=YES | 281 #USE_MD5=YES |
278 HTTP_MODULES="$HTTP_MODULES $HTTP_PROXY_MODULE" | 282 HTTP_MODULES="$HTTP_MODULES $HTTP_PROXY_MODULE" |
279 HTTP_DEPS="$HTTP_DEPS $HTTP_PROXY_DEPS" | 283 HTTP_DEPS="$HTTP_DEPS $HTTP_PROXY_DEPS" |
280 HTTP_SRCS="$HTTP_SRCS $HTTP_PROXY_SRCS" | 284 HTTP_SRCS="$HTTP_SRCS $HTTP_PROXY_SRCS" |
281 fi | 285 fi |