From 0604d8db6b94e484ad4e7b55f64e44386d687e39 Mon Sep 17 00:00:00 2001 From: Lai Jiang Date: Wed, 27 Apr 2022 10:18:37 -0400 Subject: [PATCH 1/2] Fix an error (#7924) --- .../src/main/asciidoc/operations-guide/begin/deploy.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/documentation/jetty-documentation/src/main/asciidoc/operations-guide/begin/deploy.adoc b/documentation/jetty-documentation/src/main/asciidoc/operations-guide/begin/deploy.adoc index ed20e96c220..f622c9fe55c 100644 --- a/documentation/jetty-documentation/src/main/asciidoc/operations-guide/begin/deploy.adoc +++ b/documentation/jetty-documentation/src/main/asciidoc/operations-guide/begin/deploy.adoc @@ -42,7 +42,7 @@ mywebapp.war <1> Publicly accessible resources such as `+*.html+`, `+*.jsp+`, `+*.css+`, `+*.js+` files, etc. are placed in `+*.war+` or in sub-directories of the `+*.war+`. <2> `WEB-INF` is a special directory used to store anything related to the web application that must not be publicly accessible, but may be accessed by other resources. <3> `WEB-INF/classes` stores the web application compiled `+*.class+` files -<4> `WEB-INF/classes` stores the web application `+*.jar+` files +<4> `WEB-INF/lib` stores the web application `+*.jar+` files <5> `WEB-INF/web.xml` is the web application deployment descriptor defines the components and the configuration of your web application. ==== From 1369693a99e3d9cb97988ec99399945792610570 Mon Sep 17 00:00:00 2001 From: Padraic Renaghan Date: Wed, 27 Apr 2022 18:40:07 -0400 Subject: [PATCH 2/2] Fix #7929 requestlog format string commented default Signed-off-by: Padraic Renaghan --- jetty-server/src/main/config/modules/requestlog.mod | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jetty-server/src/main/config/modules/requestlog.mod b/jetty-server/src/main/config/modules/requestlog.mod index 8c2848360f9..220c0033a57 100644 --- a/jetty-server/src/main/config/modules/requestlog.mod +++ b/jetty-server/src/main/config/modules/requestlog.mod @@ -19,7 +19,7 @@ logs/ [ini-template] # tag::documentation[] ## Request log line 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" +#jetty.requestlog.formatString=%{client}a - %u %{dd/MMM/yyyy:HH:mm:ss ZZZ|GMT}t "%r" %s %O "%{Referer}i" "%{User-Agent}i" ## The logging directory (relative to $JETTY_BASE). # jetty.requestlog.dir=logs