From 55201f9c4a9983823ebafa129b31fc0767c6e172 Mon Sep 17 00:00:00 2001
From: John Gardiner Myers <jgmyers@proofpoint.com>
Date: Wed, 5 Jan 2022 21:48:25 -0800
Subject: [PATCH] Support IPv6 in echoserver

---
 test/images/echoserver/README.md  | 1 +
 test/images/echoserver/VERSION    | 2 +-
 test/images/echoserver/nginx.conf | 2 ++
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/test/images/echoserver/README.md b/test/images/echoserver/README.md
index 8164ae5bda9..37d35585db8 100644
--- a/test/images/echoserver/README.md
+++ b/test/images/echoserver/README.md
@@ -2,6 +2,7 @@
 
 This is a simple server that responds with the http headers it received.
 
+Image versions >= 2.5 support IPv6.
 Image Versions >= 1.10 support HTTP2 on :8443.
 Image Versions >= 1.9 expose HTTPS endpoint on :8443.
 Image versions >= 1.4 removes the redirect introduced in 1.3.
diff --git a/test/images/echoserver/VERSION b/test/images/echoserver/VERSION
index 6b4950e3de2..95e3ba81920 100644
--- a/test/images/echoserver/VERSION
+++ b/test/images/echoserver/VERSION
@@ -1 +1 @@
-2.4
+2.5
diff --git a/test/images/echoserver/nginx.conf b/test/images/echoserver/nginx.conf
index b42f57d291a..d89721f148d 100644
--- a/test/images/echoserver/nginx.conf
+++ b/test/images/echoserver/nginx.conf
@@ -72,7 +72,9 @@ Request Body:
 		# basically instructs to create an individual listening socket for each worker process (using the SO_REUSEPORT
 		# socket option), allowing a kernel to distribute incoming connections between worker processes.
 		listen 8080 default_server reuseport;
+		listen [::]:8080 default_server reuseport;
 		listen 8443 default_server ssl http2 reuseport;
+		listen [::]:8443 default_server ssl http2 reuseport;
 
 		ssl_certificate /certs/certificate.crt;
 		ssl_certificate_key /certs/privateKey.key;