You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by pi...@apache.org on 2012/07/24 15:52:29 UTC
svn commit: r1365059 -
/karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/resources/extra/jetty.xml
Author: pieber
Date: Tue Jul 24 13:52:28 2012
New Revision: 1365059
URL: http://svn.apache.org/viewvc?rev=1365059&view=rev
Log:
[KARAF-1666] Make sure that really nasty jetty bug does not occure for users accidentially
Signed-off-by: Andreas Pieber <an...@gmail.com>
(cherry picked from commit dc8a3209e32812508b79b6a6da43edd6a12aa8d5)
Conflicts:
assemblies/apache-karaf/src/main/resources/extra/jetty.xml
Signed-off-by: Andreas Pieber <an...@gmail.com>
Modified:
karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/resources/extra/jetty.xml
Modified: karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/resources/extra/jetty.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/resources/extra/jetty.xml?rev=1365059&r1=1365058&r2=1365059&view=diff
==============================================================================
--- karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/resources/extra/jetty.xml (original)
+++ karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/resources/extra/jetty.xml Tue Jul 24 13:52:28 2012
@@ -27,24 +27,30 @@ DTD Configure//EN" "http://jetty.mortbay
<!-- One of each type! -->
<!-- =========================================================== -->
- <!-- Use this connector for many frequently idle connections
- and for threadless continuations.
+ <!--
+ !!WARNING!! We use a blocking instead of a selector connector here to
+ make the default configuration avoid the jetty issue 357318. If you're
+ sure that the JDK/JRE you're usign does not face that issue feel free
+ to change that back but please make sure that you've read the Jetty
+ bug and make sure that it does not affect you first! !! WARNING!!
-->
<Call name="addConnector">
- <Arg>
- <New class="org.eclipse.jetty.server.nio.SelectChannelConnector">
- <Set name="host"><Property name="jetty.host" /></Set>
- <Set name="port"><Property name="jetty.port" default="8181"/></Set>
- <Set name="maxIdleTime">300000</Set>
- <Set name="Acceptors">2</Set>
- <Set name="statsOn">false</Set>
- <Set name="confidentialPort">8443</Set>
- <Set name="lowResourcesConnections">20000</Set>
- <Set name="lowResourcesMaxIdleTime">5000</Set>
- </New>
- </Arg>
+ <Arg>
+ <New class="org.eclipse.jetty.server.nio.BlockingChannelConnector">
+ <Set name="host">
+ <Property name="jetty.host" />
+ </Set>
+ <Set name="port">
+ <Property name="jetty.port" default="8181"/>
+ </Set>
+ <Set name="maxIdleTime">300000</Set>
+ <Set name="Acceptors">2</Set>
+ <Set name="statsOn">false</Set>
+ <Set name="confidentialPort">8443</Set>
+ </New>
+ </Arg>
</Call>
-
+
<!-- =========================================================== -->
<!-- Configure Authentication Realms -->
<!-- Realms may be configured for the entire server here, or -->