diff --git a/Makefile b/Makefile index 0627d7a..c0ff43b 100644 --- a/Makefile +++ b/Makefile @@ -12,11 +12,11 @@ all: .libs/mod_proxy_protocol.so # build the so in the current directory .libs/mod_proxy_protocol.so: mod_proxy_protocol.c - $(APXS) -c mod_proxy_protocol.c + $(APXS) -c -Wc,-Wall mod_proxy_protocol.c # install the so - usually needs root access install: .libs/mod_proxy_protocol.so - $(APXS) -i mod_proxy_protocol.c + $(APXS) -i mod_proxy_protocol.la # generate the html doc docs: mod_proxy_protocol.html diff --git a/README.md b/README.md index cbc25bc..eebeb68 100644 --- a/README.md +++ b/README.md @@ -4,6 +4,10 @@ This is an [Apache](http://httpd.apache.org/) module that implements the server side of HAProxy's [Proxy Protocol](http://blog.haproxy.com/haproxy/proxy-protocol/). +Note: as of Apache 2.4.30 this code has been merged into +[mod_remoteip](https://httpd.apache.org/docs/2.4/mod/mod_remoteip.html), +with the `ProxyProtocol` directive renamed to `RemoteIPProxyProtocol`. + ## Build and Install You'll need the apache development packages installed (typically something diff --git a/debian/control b/debian/control index a0cdc0a..596d88b 100644 --- a/debian/control +++ b/debian/control @@ -8,7 +8,7 @@ Homepage: https://github.com/roadrunner2/mod-proxy-protocol Package: libapache2-mod-proxy-protocol Architecture: amd64 -Depends: ${shlibs:Depends}, ${misc:Depends}, apache2-api-20120211, apache2 (>= 2.4.0) +Depends: ${shlibs:Depends}, ${misc:Depends}, apache2-api-20120211 Description: Apache module for proxy protocol The proxy protocol is a way for upstream proxies and load-balancers to for the ip-address of the client to the server. This package contains diff --git a/debian/docs b/debian/docs index 931c46d..e980146 100644 --- a/debian/docs +++ b/debian/docs @@ -1,5 +1,4 @@ README.md mod_proxy_protocol.xml mod_proxy_protocol.xml.meta -mod_proxy_protocol.html debian/README.Debian diff --git a/debian/rules b/debian/rules index db2bc2a..f311f7d 100755 --- a/debian/rules +++ b/debian/rules @@ -4,7 +4,7 @@ build: dh_testdir - make all docs + make all # docs clean: dh_testdir