restore compatibility with v0.6 config directives

diff --git a/0.6-compat.patch b/0.6-compat.patch
new file mode 100644 (file)
index 0000000..83fe571
--- /dev/null
+++ b/0.6-compat.patch
@@ -0,0 +1,35 @@
+--- mod_rpaf-0.8.4/mod_rpaf.c~ 2015-09-11 16:21:34.000000000 +0300
++++ mod_rpaf-0.8.4/mod_rpaf.c  2015-09-11 16:21:40.142295508 +0300
+@@ -420,6 +420,32 @@
+                  RSRC_CONF,
+                  "Which header to look for when trying to find the real ip of the client in a proxy setup"
+                  ),
++
++      /*
++       * DEPRECATED
++       * Backward (0.6) compatible config directives for smooth upgrade.
++       */
++    AP_INIT_FLAG(
++                 "RPAFEnable",
++                 rpaf_enable,
++                 NULL,
++                 RSRC_CONF,
++                 "Enable mod_rpaf"
++                 ),
++    AP_INIT_ITERATE(
++                 "RPAFproxy_ips",
++                 rpaf_set_proxy_ip,
++                 NULL,
++                 RSRC_CONF,
++                 "IP(s) of Proxy server setting X-Forwarded-For header"
++                 ),
++    AP_INIT_FLAG(
++                 "RPAFsethostname",
++                 rpaf_sethostname,
++                 NULL,
++                 RSRC_CONF,
++                 "Let mod_rpaf set the hostname from the X-Host header and update vhosts"
++                 ),
+     { NULL }
+ };
+ 

diff --git a/apache-mod_rpaf.spec b/apache-mod_rpaf.spec
index 82317d1642c8936039ac888f53fe90b61838bec4..b223087288661e70184ede2147eefda23dab36c5 100644 (file)
--- a/apache-mod_rpaf.spec
+++ b/apache-mod_rpaf.spec
@@ -10,6 +10,7 @@ Group:                Networking/Daemons/HTTP
 Source0:       https://github.com/gnif/mod_rpaf/archive/v%{version}/mod_%{mod_name}-%{version}.tar.gz
 # Source0-md5: 8fbd9ee19f8ea4e25ab8414685276105
 Source1:       %{name}.conf
+Patch0:                0.6-compat.patch
 URL:           https://github.com/gnif/mod_rpaf/
 BuildRequires: apache-devel >= 2.2
 BuildRequires: rpmbuild(macros) >= 1.268
@@ -31,6 +32,7 @@ mod_proxy_add_forward jest dla frontendowych.
 
 %prep
 %setup -q -n mod_%{mod_name}-%{version}
+%patch0 -p1
 
 %build
 %{apxs} -S CC="--tag=CC %{__cc}" -c -n mod_%{mod_name}.o mod_%{mod_name}.c