Merge branch '1.5.x' into 2.0.x

This commit is contained in:
Andy Wilkinson 2019-07-01 15:57:00 +01:00
commit 0c44584b44

View File

@ -3032,7 +3032,7 @@ Common server settings include:
* Network settings: Listen port for incoming HTTP requests (`server.port`), interface
address to bind to `server.address`, and so on.
* Session settings: Whether the session is persistent (`server.servlet.session.persistence`),
* Session settings: Whether the session is persistent (`server.servlet.session.persistent`),
session timeout (`server.servlet.session.timeout`), location of session data
(`server.servlet.session.store-dir`), and session-cookie configuration
(`server.servlet.session.cookie.*`).