[patch] nginx-geoip-forwardheader-error.patch

nginx-geoip-forwardheader-error.patch (text/plain), 1.36 KB, created by Chris White on 2012-07-25 22:06:16 UTC

Chris White <[e-mail]>

When building the geoip module, the x_forwarded_for member of the ngx_http_headers_in_t struct is utilized. However given the declaration below:

#if (NGX_HTTP_PROXY || NGX_HTTP_REALIP || NGX_HTTP_GEO)
    ngx_table_elt_t                  *x_forwarded_for;
#endif

This is not enabled for the geoip module. This means that:

./configure --with-http_geoip_module --without-http_geo_module --without-http_proxy_module

causes a compilation error. This patch simply adds geoip to the list of modules to check for in order for this member to become available. It also creates the appropriate DEFINE for GEOIP to intiate this check. 

--- src/http/ngx_http_request.h.orig	2012-07-25 14:08:09.468871070 -0700
+++ src/http/ngx_http_request.h	2012-07-25 14:08:42.318466303 -0700
@@ -192,7 +192,7 @@
 
     ngx_table_elt_t                  *keep_alive;
 
-#if (NGX_HTTP_PROXY || NGX_HTTP_REALIP || NGX_HTTP_GEO)
+#if (NGX_HTTP_PROXY || NGX_HTTP_REALIP || NGX_HTTP_GEO || NGX_HTTP_GEOIP)
     ngx_table_elt_t                  *x_forwarded_for;
 #endif
 
--- auto/modules.orig	2012-07-25 14:23:33.135374180 -0700
+++ auto/modules	2012-07-25 14:23:49.495167056 -0700
@@ -239,6 +239,7 @@
 fi
 
 if [ $HTTP_GEOIP = YES ]; then
+    have=NGX_HTTP_GEOIP . auto/have
     HTTP_MODULES="$HTTP_MODULES $HTTP_GEOIP_MODULE"
     HTTP_SRCS="$HTTP_SRCS $HTTP_GEOIP_SRCS"
 fi