Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x
This commit is contained in:
commit
a5d3f29f11
|
@ -179,7 +179,9 @@ public class Http2Server
|
||||||
content+="session="+session.getId()+(session.isNew()?"(New)\n":"\n");
|
content+="session="+session.getId()+(session.isNew()?"(New)\n":"\n");
|
||||||
content+="date="+new Date()+"\n";
|
content+="date="+new Date()+"\n";
|
||||||
|
|
||||||
for (Cookie c : request.getCookies())
|
Cookie[] cookies = request.getCookies();
|
||||||
|
if (cookies!=null && cookies.length>0)
|
||||||
|
for (Cookie c : cookies)
|
||||||
content+="cookie "+c.getName()+"="+c.getValue()+"\n";
|
content+="cookie "+c.getName()+"="+c.getValue()+"\n";
|
||||||
|
|
||||||
response.setContentLength(content.length());
|
response.setContentLength(content.length());
|
||||||
|
|
|
@ -4,6 +4,12 @@
|
||||||
<!-- ============================================================= -->
|
<!-- ============================================================= -->
|
||||||
<!-- SSL ContextFactory configuration -->
|
<!-- SSL ContextFactory configuration -->
|
||||||
<!-- ============================================================= -->
|
<!-- ============================================================= -->
|
||||||
|
|
||||||
|
<!--
|
||||||
|
To configure Includes / Excludes for Cipher Suites or Protocols see tweak-ssl.xml example at
|
||||||
|
https://www.eclipse.org/jetty/documentation/current/configuring-ssl.html#configuring-sslcontextfactory-cipherSuites
|
||||||
|
-->
|
||||||
|
|
||||||
<Configure id="sslContextFactory" class="org.eclipse.jetty.util.ssl.SslContextFactory">
|
<Configure id="sslContextFactory" class="org.eclipse.jetty.util.ssl.SslContextFactory">
|
||||||
<Set name="KeyStorePath"><Property name="jetty.base" default="." />/<Property name="jetty.sslContext.keyStorePath" deprecated="jetty.keystore" default="etc/keystore"/></Set>
|
<Set name="KeyStorePath"><Property name="jetty.base" default="." />/<Property name="jetty.sslContext.keyStorePath" deprecated="jetty.keystore" default="etc/keystore"/></Set>
|
||||||
<Set name="KeyStorePassword"><Property name="jetty.sslContext.keyStorePassword" deprecated="jetty.keystore.password" default="OBF:1vny1zlo1x8e1vnw1vn61x8g1zlu1vn4"/></Set>
|
<Set name="KeyStorePassword"><Property name="jetty.sslContext.keyStorePassword" deprecated="jetty.keystore.password" default="OBF:1vny1zlo1x8e1vnw1vn61x8g1zlu1vn4"/></Set>
|
||||||
|
@ -17,8 +23,7 @@
|
||||||
<Set name="EndpointIdentificationAlgorithm"></Set>
|
<Set name="EndpointIdentificationAlgorithm"></Set>
|
||||||
<Set name="NeedClientAuth"><Property name="jetty.sslContext.needClientAuth" deprecated="jetty.ssl.needClientAuth" default="false"/></Set>
|
<Set name="NeedClientAuth"><Property name="jetty.sslContext.needClientAuth" deprecated="jetty.ssl.needClientAuth" default="false"/></Set>
|
||||||
<Set name="WantClientAuth"><Property name="jetty.sslContext.wantClientAuth" deprecated="jetty.ssl.wantClientAuth" default="false"/></Set>
|
<Set name="WantClientAuth"><Property name="jetty.sslContext.wantClientAuth" deprecated="jetty.ssl.wantClientAuth" default="false"/></Set>
|
||||||
<!-- To configure Includes / Excludes for Cipher Suites or Protocols see tweak-ssl.xml example at
|
|
||||||
https://www.eclipse.org/jetty/documentation/current/configuring-ssl.html#configuring-sslcontextfactory-cipherSuites
|
|
||||||
-->
|
|
||||||
<Set name="useCipherSuitesOrder"><Property name="jetty.sslContext.useCipherSuitesOrder" default="true"/></Set>
|
<Set name="useCipherSuitesOrder"><Property name="jetty.sslContext.useCipherSuitesOrder" default="true"/></Set>
|
||||||
|
<Set name="sslSessionCacheSize"><Property name="jetty.sslContext.sslSessionCacheSize" default="-1"/></Set>
|
||||||
|
<Set name="sslSessionTimeout"><Property name="jetty.sslContext.sslSessionTimeout" default="-1"/></Set>
|
||||||
</Configure>
|
</Configure>
|
||||||
|
|
|
@ -87,3 +87,9 @@ https://raw.githubusercontent.com/eclipse/jetty.project/master/jetty-server/src/
|
||||||
|
|
||||||
## To configure Includes / Excludes for Cipher Suites or Protocols see tweak-ssl.xml example at
|
## To configure Includes / Excludes for Cipher Suites or Protocols see tweak-ssl.xml example at
|
||||||
## https://www.eclipse.org/jetty/documentation/current/configuring-ssl.html#configuring-sslcontextfactory-cipherSuites
|
## https://www.eclipse.org/jetty/documentation/current/configuring-ssl.html#configuring-sslcontextfactory-cipherSuites
|
||||||
|
|
||||||
|
## Set the size of the SslSession cache
|
||||||
|
# jetty.sslContext.sslSessionCacheSize=-1
|
||||||
|
|
||||||
|
## Set the timeout (in seconds) of the SslSession cache timeout
|
||||||
|
# jetty.sslContext.sslSessionTimeout=-1
|
||||||
|
|
|
@ -286,7 +286,7 @@ public class QueuedThreadPool extends AbstractLifeCycle implements SizedThreadPo
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Set the maximum number of threads.
|
* Get the maximum number of threads.
|
||||||
* Delegated to the named or anonymous Pool.
|
* Delegated to the named or anonymous Pool.
|
||||||
*
|
*
|
||||||
* @return maximum number of threads.
|
* @return maximum number of threads.
|
||||||
|
|
Loading…
Reference in New Issue