From ea3339d3950e5f9bf8d051aae82ea232a89499e9 Mon Sep 17 00:00:00 2001 From: WalkerWatch Date: Tue, 26 Feb 2019 10:59:32 -0500 Subject: [PATCH] Updating documentation for #3388 Signed-off-by: WalkerWatch --- .../startup/startup-base-vs-home.adoc | 1 + .../contexts/setting-form-size.adoc | 29 +++++++++++++++++-- 2 files changed, 28 insertions(+), 2 deletions(-) diff --git a/jetty-documentation/src/main/asciidoc/administration/startup/startup-base-vs-home.adoc b/jetty-documentation/src/main/asciidoc/administration/startup/startup-base-vs-home.adoc index 41ecada6ffc..6e3f8b6a959 100644 --- a/jetty-documentation/src/main/asciidoc/administration/startup/startup-base-vs-home.adoc +++ b/jetty-documentation/src/main/asciidoc/administration/startup/startup-base-vs-home.adoc @@ -20,6 +20,7 @@ === Managing Jetty Base and Jetty Home Instead of managing multiple Jetty implementations out of several different distribution locations, it is possible to maintain a separation between the binary installation of the standalone Jetty (known as `${jetty.home}`), and the customizations for your specific environment(s) (known as `${jetty.base}`). +In addition to easy management of multiple server instances, is allows for quick, drop-in upgrades of Jetty. There should always only be *one* Jetty Home (per version of Jetty), but there can be multiple Jetty Base directories that reference it. Jetty Base:: diff --git a/jetty-documentation/src/main/asciidoc/configuring/contexts/setting-form-size.adoc b/jetty-documentation/src/main/asciidoc/configuring/contexts/setting-form-size.adoc index 7a0ee0c1910..9ffc5f8ce3f 100644 --- a/jetty-documentation/src/main/asciidoc/configuring/contexts/setting-form-size.adoc +++ b/jetty-documentation/src/main/asciidoc/configuring/contexts/setting-form-size.adoc @@ -44,7 +44,7 @@ In either case the syntax of the XML file is the same: ==== For All Apps on a Server -Set an attribute on the Server instance for which you want to modify the maximum form content size: +Set an attribute in `jetty.xml` on the Server instance for which you want to modify the maximum form content size: [source, xml, subs="{sub-order}"] ---- @@ -56,7 +56,32 @@ Set an attribute on the Server instance for which you want to modify the maximum ---- +____ +[IMPORTANT] +It is important to remember that you should *not* modify the XML files in your `$JETTY_HOME`. +If you do for some reason feel you want to change the way an XML file operates, it is best to make a copy of it in your `$JETTY_BASE` in an `/etc` directory. +Jetty will always look first to the `$JETTY_BASE` for configuration. +____ + ==== For All Apps in the JVM Use the system property `org.eclipse.jetty.server.Request.maxFormContentSize`. -This can be set on the command line or in the `start.ini` or `start.d\server.ini` file. +This can be set on the command line or in the `$JETTY_BASE\start.ini` or any `$JETTY_BASE\start.d\*.ini` link:#startup-modules[module ini file.] +Using `$JETTY_BASE\start.d\server.ini` as an example: + +[source, console, subs="{sub-order}"] +---- +# --------------------------------------- +# Module: server +# Enables the core Jetty server on the classpath. +# --------------------------------------- +--module=server + +### Common HTTP configuration +## Scheme to use to build URIs for secure redirects +# jetty.httpConfig.secureScheme=https + +... + +-Dorg.eclipse.jetty.server.Request.maxFormContentSize=200000 +----