commit 8232b83d3fa47a1399f155cb829db829369fbae9 (refs/remotes/origin/v3.5)

Author: squidadm <squidadm@users.noreply.github.com>

Date:   2018-01-21 08:07:08 +1300

    Fix indirect IP logging for transactions without a client connection (#129) (#136)

diff --git a/src/client_side_request.cc b/src/client_side_request.cc

index be124f3..203f89d 100644

--- a/src/client_side_request.cc

+++ b/src/client_side_request.cc

@@ -488,9 +488,9 @@ clientFollowXForwardedForCheck(allow_t answer, void *data)

         * Ensure that the access log shows the indirect client

         * instead of the direct client.

         */

-        ConnStateData *conn = http->getConn();

-        conn->log_addr = request->indirect_client_addr;

-        http->al->cache.caddr = conn->log_addr;

+        http->al->cache.caddr = request->indirect_client_addr;

+        if (ConnStateData *conn = http->getConn())

+            conn->log_addr = request->indirect_client_addr;

     }

     request->x_forwarded_for_iterator.clean();

     request->flags.done_follow_x_forwarded_for = true;