Merge branch 'fix-remote-ip-3009' into 'v2.0'

Fix #3009

See merge request !385

doc/sources/admin/upgrade_2_x.rst

@@ -26,6 +26,17 @@ Known regressions in the latest released version
 
 None
 
+2.18.0
+------
+
+Apache2 handler now uses IP from mod_remoteip
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+If you use `mod_remoteip <https://httpd.apache.org/docs/2.4/mod/mod_remoteip.html>`__ in your handlers,
+LemonLDAP::NG will now correctly use the IP from ``mod_remoteip`` in
+``$env->{REMOTE_ADDR}``.
+
+
 2.17.1
 ------
 

lemonldap-ng-handler/lib/Lemonldap/NG/Handler/ApacheMP2/Request.pm

@@ -17,11 +17,8 @@ sub new {
     my $env      = {
 
         #%ENV,
-        HTTP_HOST   => $r->hostname,
-        REMOTE_ADDR => (
-              $r->connection->can('remote_ip') ? $r->connection->remote_ip
-            : $r->connection->client_ip
-        ),
+        HTTP_HOST         => $r->hostname,
+        REMOTE_ADDR       => $r->useragent_ip,
         QUERY_STRING      => $args,
         REQUEST_URI       => $uri_full,
         PATH_INFO         => '',