From a26fb6a77384b60f9712e3b0810c70923ecf4963 Mon Sep 17 00:00:00 2001 From: Phil Pennock Date: Wed, 1 Feb 2017 12:34:52 -0500 Subject: [PATCH] bug-fix test-driving input The client driver is a little restrictive in the escape sequences it handles; two octets here were missing the `x` after the `\`, so `\05` is two octets, a 0 and then a 5, where `\x05` would be one octet. So we were sending two more octets than expected, not catching that Exim was parsing the wrong IP/port at the end, and now that Exim only reads as much of the proxy protocol header as belongs in it, instead of "up to the largest it could be", this test-bug has been exposed. --- test/scripts/4030-proxy-protocol/4030 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/scripts/4030-proxy-protocol/4030 b/test/scripts/4030-proxy-protocol/4030 index 8b560bcbc..50dca160a 100644 --- a/test/scripts/4030-proxy-protocol/4030 +++ b/test/scripts/4030-proxy-protocol/4030 @@ -50,7 +50,7 @@ QUIT # # protocol v2 plain receive client HOSTIPV4 PORT_D ->>> \x0D\x0A\x0D\x0A\x00\x0D\x0A\x51\x55\x49\x54\x0A\x21\x11\x00\x0c\xc0\xa8\x00\x0f\xc0\xa8\x00\05\xc2\x95\x04\01 +>>> \x0D\x0A\x0D\x0A\x00\x0D\x0A\x51\x55\x49\x54\x0A\x21\x11\x00\x0c\xc0\xa8\x00\x0f\xc0\xa8\x00\x05\xc2\x95\x04\x01 ??? 220 HELO clientname ??? 250 -- 2.25.1