From 08c4ce14abebb393c3d85dd2513c25277bc714c0 Mon Sep 17 00:00:00 2001
From: Lachlan Roberts <lachlan@webtide.com>
Date: Thu, 4 Mar 2021 11:19:14 +1100
Subject: [PATCH 1/3] Issue #6008 - fix RequestLog usage with filePath.

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
---
 jetty-server/src/main/config/etc/jetty-requestlog.xml | 6 +++++-
 jetty-server/src/main/config/modules/requestlog.mod   | 3 +++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/jetty-server/src/main/config/etc/jetty-requestlog.xml b/jetty-server/src/main/config/etc/jetty-requestlog.xml
index 58a201e96ba7..f013f552cf63 100644
--- a/jetty-server/src/main/config/etc/jetty-requestlog.xml
+++ b/jetty-server/src/main/config/etc/jetty-requestlog.xml
@@ -18,7 +18,11 @@
           <Arg>
             <Call name="resolvePath" class="org.eclipse.jetty.xml.XmlConfiguration">
               <Arg><Property name="jetty.base"/></Arg>
-              <Arg><Property name="jetty.requestlog.dir" default="logs" />/yyyy_mm_dd.request.log</Arg>
+              <Arg>
+                <Property name="jetty.requestlog.filePath">
+                  <Default><Property name="jetty.requestlog.dir" default="logs"/>/yyyy_mm_dd.request.log</Default>
+                </Property>
+              </Arg>
             </Call>
           </Arg>
 
diff --git a/jetty-server/src/main/config/modules/requestlog.mod b/jetty-server/src/main/config/modules/requestlog.mod
index e4a660b3f3c4..1e78094265c8 100644
--- a/jetty-server/src/main/config/modules/requestlog.mod
+++ b/jetty-server/src/main/config/modules/requestlog.mod
@@ -16,6 +16,9 @@ etc/jetty-requestlog.xml
 [files]
 logs/
 
+[ini]
+jetty.requestlog.dir?=logs
+
 [ini-template]
 ## Format string
 # jetty.requestlog.formatString=%a - %u %{dd/MMM/yyyy:HH:mm:ss ZZZ|GMT}t "%r" %s %B "%{Referer}i" "%{User-Agent}i" "%C"

From c1215e46c2149334d403358e11ddb69414e8f92e Mon Sep 17 00:00:00 2001
From: Lachlan Roberts <lachlan@webtide.com>
Date: Tue, 9 Mar 2021 18:35:34 +1100
Subject: [PATCH 2/3] Issue #6008 - changes from review

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
---
 jetty-server/src/main/config/etc/jetty-requestlog.xml | 4 +++-
 jetty-server/src/main/config/modules/requestlog.mod   | 3 ---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/jetty-server/src/main/config/etc/jetty-requestlog.xml b/jetty-server/src/main/config/etc/jetty-requestlog.xml
index f013f552cf63..1b3a7a070117 100644
--- a/jetty-server/src/main/config/etc/jetty-requestlog.xml
+++ b/jetty-server/src/main/config/etc/jetty-requestlog.xml
@@ -20,7 +20,9 @@
               <Arg><Property name="jetty.base"/></Arg>
               <Arg>
                 <Property name="jetty.requestlog.filePath">
-                  <Default><Property name="jetty.requestlog.dir" default="logs"/>/yyyy_mm_dd.request.log</Default>
+                  <Default>
+                    <Property name="jetty.requestlog.dir" default="logs"/>/yyyy_mm_dd.request.log
+                  </Default>
                 </Property>
               </Arg>
             </Call>
diff --git a/jetty-server/src/main/config/modules/requestlog.mod b/jetty-server/src/main/config/modules/requestlog.mod
index 1e78094265c8..e4a660b3f3c4 100644
--- a/jetty-server/src/main/config/modules/requestlog.mod
+++ b/jetty-server/src/main/config/modules/requestlog.mod
@@ -16,9 +16,6 @@ etc/jetty-requestlog.xml
 [files]
 logs/
 
-[ini]
-jetty.requestlog.dir?=logs
-
 [ini-template]
 ## Format string
 # jetty.requestlog.formatString=%a - %u %{dd/MMM/yyyy:HH:mm:ss ZZZ|GMT}t "%r" %s %B "%{Referer}i" "%{User-Agent}i" "%C"

From 671a76c613bdf7a84a65aa5d1679f84feb59c2b1 Mon Sep 17 00:00:00 2001
From: Lachlan Roberts <lachlan@webtide.com>
Date: Wed, 10 Mar 2021 21:37:30 +1100
Subject: [PATCH 3/3] Issue #6008 - add default ini line for
 jetty.requestlog.dir

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
---
 jetty-server/src/main/config/modules/requestlog.mod | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/jetty-server/src/main/config/modules/requestlog.mod b/jetty-server/src/main/config/modules/requestlog.mod
index e4a660b3f3c4..1e78094265c8 100644
--- a/jetty-server/src/main/config/modules/requestlog.mod
+++ b/jetty-server/src/main/config/modules/requestlog.mod
@@ -16,6 +16,9 @@ etc/jetty-requestlog.xml
 [files]
 logs/
 
+[ini]
+jetty.requestlog.dir?=logs
+
 [ini-template]
 ## Format string
 # jetty.requestlog.formatString=%a - %u %{dd/MMM/yyyy:HH:mm:ss ZZZ|GMT}t "%r" %s %B "%{Referer}i" "%{User-Agent}i" "%C"