diff options
| author | Greg Wilkins | 2014-08-29 05:49:25 +0000 |
|---|---|---|
| committer | Greg Wilkins | 2014-08-29 05:49:25 +0000 |
| commit | 5507e267ae97ebe41d4014e1ce89d811080a68a4 (patch) | |
| tree | c481f78a35351b0dcea4144c1fb9c6d8463fb122 /jetty-server/src/main/config/etc/jetty-ssl.xml | |
| parent | edcb56ae6bd3d5fb02187ee49ae8dd6766de6fdd (diff) | |
| parent | 69390954dc15acc389479b647f290da121ccc9de (diff) | |
| download | org.eclipse.jetty.project-5507e267ae97ebe41d4014e1ce89d811080a68a4.tar.gz org.eclipse.jetty.project-5507e267ae97ebe41d4014e1ce89d811080a68a4.tar.xz org.eclipse.jetty.project-5507e267ae97ebe41d4014e1ce89d811080a68a4.zip | |
Merge remote-tracking branch 'origin/master' into jetty-http2
Conflicts:
jetty-server/src/main/config/etc/jetty-https.xml
jetty-server/src/main/config/modules/ssl.mod
jetty-start/src/main/java/org/eclipse/jetty/start/Modules.java
Diffstat (limited to 'jetty-server/src/main/config/etc/jetty-ssl.xml')
| -rw-r--r-- | jetty-server/src/main/config/etc/jetty-ssl.xml | 23 |
1 files changed, 14 insertions, 9 deletions
diff --git a/jetty-server/src/main/config/etc/jetty-ssl.xml b/jetty-server/src/main/config/etc/jetty-ssl.xml index 1014c8507a..24f6380fa9 100644 --- a/jetty-server/src/main/config/etc/jetty-ssl.xml +++ b/jetty-server/src/main/config/etc/jetty-ssl.xml @@ -15,15 +15,20 @@ <Arg> <New id="sslConnector" class="org.eclipse.jetty.server.ServerConnector"> <Arg name="server"><Ref refid="Server" /></Arg> - <Arg name="factories"> - <Array type="org.eclipse.jetty.server.ConnectionFactory"> - </Array> - </Arg> - <Set name="host"><Property name="jetty.host" /></Set> - <Set name="port"><Property name="ssl.port" default="443" /></Set> - <Set name="idleTimeout"><Property name="ssl.timeout" default="30000"/></Set> - <Set name="soLingerTime"><Property name="ssl.soLingerTime" default="-1"/></Set> - </New> + <Arg name="acceptors" type="int"><Property name="ssl.acceptors" default="-1"/></Arg> + <Arg name="selectors" type="int"><Property name="ssl.selectors" default="-1"/></Arg> + <Arg name="factories"> + <Array type="org.eclipse.jetty.server.ConnectionFactory"> + </Array> + </Arg> + + <Set name="host"><Property name="jetty.host" /></Set> + <Set name="port"><Property name="ssl.port" default="443" /></Set> + <Set name="idleTimeout"><Property name="ssl.timeout" default="30000"/></Set> + <Set name="soLingerTime"><Property name="ssl.soLingerTime" default="-1"/></Set> + <Set name="acceptorPriorityDelta"><Property name="ssl.acceptorPriorityDelta" default="0"/></Set> + <Set name="selectorPriorityDelta"><Property name="ssl.selectorPriorityDelta" default="0"/></Set> + </New> </Arg> </Call> |