Attachment 190916 Details for Bug 226139 – patch file

[patch] patch file

www_squid.patch (text/plain), 1.64 KB, created by Yasuhiro Kimura on 2018-02-23 12:04:13 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Yasuhiro Kimura

Created: 2018-02-23 12:04:13 UTC

Size: 1.64 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 462684)
>+++ Makefile	(working copy)
>@@ -2,7 +2,7 @@
> 
> PORTNAME=	squid
> PORTVERSION=	3.5.27
>-PORTREVISION=	2
>+PORTREVISION=	3
> CATEGORIES=	www ipv6
> MASTER_SITES=	http://www.squid-cache.org/Versions/v3/${PORTVERSION:R}/ \
> 		http://www2.us.squid-cache.org/Versions/v3/${PORTVERSION:R}/ \
>Index: files/patch-CVE-2018-1000027
>===================================================================
>--- files/patch-CVE-2018-1000027	(nonexistent)
>+++ files/patch-CVE-2018-1000027	(working copy)
>@@ -0,0 +1,23 @@
>+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 src/client_side_request.cc src/client_side_request.cc
>+index be124f3..203f89d 100644
>+--- src/client_side_request.cc
>++++ 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;

Actions: View | Diff

Attachments on bug 226139: 190916 | 190918