February 2011 - jbossweb-commits - Jboss List Archives

JBossWeb SVN: r1648 - branches/3.0.x/java/org/apache/coyote and 1 other directories.

by jbossweb-commits＠lists.jboss.org

Author: remy.maucherat(a)jboss.com Date: 2011-02-09 05:45:55 -0500 (Wed, 09 Feb 2011) New Revision: 1648 Modified: branches/2.1.x/java/org/apache/coyote/Constants.java branches/3.0.x/java/org/apache/coyote/Constants.java trunk/java/org/apache/coyote/Constants.java Log: - Increase max wait to 300s. Modified: branches/2.1.x/java/org/apache/coyote/Constants.java =================================================================== --- branches/2.1.x/java/org/apache/coyote/Constants.java 2011-02-09 10:39:06 UTC (rev 1647) +++ branches/2.1.x/java/org/apache/coyote/Constants.java 2011-02-09 10:45:55 UTC (rev 1648) @@ -69,6 +69,6 @@ "false")).booleanValue(); public static final int MAX_PAUSE_WAIT = - Integer.valueOf(System.getProperty("org.apache.coyote.MAX_PAUSE_WAIT", "60")).intValue(); + Integer.valueOf(System.getProperty("org.apache.coyote.MAX_PAUSE_WAIT", "300")).intValue(); } Modified: branches/3.0.x/java/org/apache/coyote/Constants.java =================================================================== --- branches/3.0.x/java/org/apache/coyote/Constants.java 2011-02-09 10:39:06 UTC (rev 1647) +++ branches/3.0.x/java/org/apache/coyote/Constants.java 2011-02-09 10:45:55 UTC (rev 1648) @@ -69,6 +69,6 @@ "false")).booleanValue(); public static final int MAX_PAUSE_WAIT = - Integer.valueOf(System.getProperty("org.apache.coyote.MAX_PAUSE_WAIT", "60")).intValue(); + Integer.valueOf(System.getProperty("org.apache.coyote.MAX_PAUSE_WAIT", "300")).intValue(); } Modified: trunk/java/org/apache/coyote/Constants.java =================================================================== --- trunk/java/org/apache/coyote/Constants.java 2011-02-09 10:39:06 UTC (rev 1647) +++ trunk/java/org/apache/coyote/Constants.java 2011-02-09 10:45:55 UTC (rev 1648) @@ -69,6 +69,6 @@ "false")).booleanValue(); public static final int MAX_PAUSE_WAIT = - Integer.valueOf(System.getProperty("org.apache.coyote.MAX_PAUSE_WAIT", "60")).intValue(); + Integer.valueOf(System.getProperty("org.apache.coyote.MAX_PAUSE_WAIT", "300")).intValue(); }

13 years, 3 months

1
0
0 / 0

JBossWeb SVN: r1647 - trunk/java/org/apache/naming/resources.

by jbossweb-commits＠lists.jboss.org

Author: remy.maucherat(a)jboss.com Date: 2011-02-09 05:39:06 -0500 (Wed, 09 Feb 2011) New Revision: 1647 Modified: trunk/java/org/apache/naming/resources/WARDirContext.java Log: - Set collection flag (the file impl has a different behavior). Modified: trunk/java/org/apache/naming/resources/WARDirContext.java =================================================================== --- trunk/java/org/apache/naming/resources/WARDirContext.java 2011-02-09 10:35:04 UTC (rev 1646) +++ trunk/java/org/apache/naming/resources/WARDirContext.java 2011-02-09 10:39:06 UTC (rev 1647) @@ -453,6 +453,8 @@ attrs.setName(entry.getName()); if (!zipEntry.isDirectory()) attrs.setResourceType(""); + else + attrs.setCollection(true); attrs.setContentLength(zipEntry.getSize()); attrs.setLastModified(zipEntry.getTime());

13 years, 3 months

1
0
0 / 0

JBossWeb SVN: r1646 - branches/2.1.x/java/org/apache/tomcat/util/net.

by jbossweb-commits＠lists.jboss.org

Author: remy.maucherat(a)jboss.com Date: 2011-02-09 05:35:04 -0500 (Wed, 09 Feb 2011) New Revision: 1646 Modified: branches/2.1.x/java/org/apache/tomcat/util/net/AprEndpoint.java branches/2.1.x/java/org/apache/tomcat/util/net/JIoEndpoint.java Log: Part of JBPAPP-5016: use the new multicore connector defaults that have been tested in AS 6. Modified: branches/2.1.x/java/org/apache/tomcat/util/net/AprEndpoint.java =================================================================== --- branches/2.1.x/java/org/apache/tomcat/util/net/AprEndpoint.java 2011-02-01 23:31:50 UTC (rev 1645) +++ branches/2.1.x/java/org/apache/tomcat/util/net/AprEndpoint.java 2011-02-09 10:35:04 UTC (rev 1646) @@ -168,7 +168,7 @@ /** * Maximum amount of worker threads. */ - protected int maxThreads = 200; + protected int maxThreads = 32 * Runtime.getRuntime().availableProcessors(); public void setMaxThreads(int maxThreads) { this.maxThreads = maxThreads; } public int getMaxThreads() { return maxThreads; } @@ -184,7 +184,7 @@ /** * Size of the socket poller. */ - protected int pollerSize = 8 * 1024; + protected int pollerSize = (OS.IS_WIN32 || OS.IS_WIN64) ? (8 * 1024) : (32 * 1024); public void setPollerSize(int pollerSize) { this.pollerSize = pollerSize; } public int getPollerSize() { return pollerSize; } @@ -192,7 +192,7 @@ /** * Size of the sendfile (= concurrent files which can be served). */ - protected int sendfileSize = 1 * 1024; + protected int sendfileSize = (OS.IS_WIN32 || OS.IS_WIN64) ? (1 * 1024) : (16 * 1024); public void setSendfileSize(int sendfileSize) { this.sendfileSize = sendfileSize; } public int getSendfileSize() { return sendfileSize; } Modified: branches/2.1.x/java/org/apache/tomcat/util/net/JIoEndpoint.java =================================================================== --- branches/2.1.x/java/org/apache/tomcat/util/net/JIoEndpoint.java 2011-02-01 23:31:50 UTC (rev 1645) +++ branches/2.1.x/java/org/apache/tomcat/util/net/JIoEndpoint.java 2011-02-09 10:35:04 UTC (rev 1646) @@ -151,7 +151,7 @@ /** * Maximum amount of worker threads. */ - protected int maxThreads = 200; + protected int maxThreads = 512 * Runtime.getRuntime().availableProcessors(); public void setMaxThreads(int maxThreads) { this.maxThreads = maxThreads; } public int getMaxThreads() { return maxThreads; }

13 years, 3 months

1
0
0 / 0

JBossWeb SVN: r1645 - branches/3.0.x/java/org/apache/catalina/connector.

by jbossweb-commits＠lists.jboss.org

Author: remy.maucherat(a)jboss.com Date: 2011-02-01 18:31:50 -0500 (Tue, 01 Feb 2011) New Revision: 1645 Modified: branches/3.0.x/java/org/apache/catalina/connector/Request.java Log: - Filter out invalid locale header. Modified: branches/3.0.x/java/org/apache/catalina/connector/Request.java =================================================================== --- branches/3.0.x/java/org/apache/catalina/connector/Request.java 2011-02-01 23:31:35 UTC (rev 1644) +++ branches/3.0.x/java/org/apache/catalina/connector/Request.java 2011-02-01 23:31:50 UTC (rev 1645) @@ -3013,7 +3013,12 @@ int semi = entry.indexOf(";q="); if (semi >= 0) { try { - quality = Double.parseDouble(entry.substring(semi + 3)); + String strQuality = entry.substring(semi + 3); + if (strQuality.length() <= 5) { + quality = Double.parseDouble(strQuality); + } else { + quality = 0.0; + } } catch (NumberFormatException e) { quality = 0.0; }

13 years, 3 months

1
0
0 / 0

JBossWeb SVN: r1644 - branches/2.1.x/java/org/apache/catalina/connector.

by jbossweb-commits＠lists.jboss.org

Author: remy.maucherat(a)jboss.com Date: 2011-02-01 18:31:35 -0500 (Tue, 01 Feb 2011) New Revision: 1644 Modified: branches/2.1.x/java/org/apache/catalina/connector/Request.java Log: - Filter out invalid locale header. Modified: branches/2.1.x/java/org/apache/catalina/connector/Request.java =================================================================== --- branches/2.1.x/java/org/apache/catalina/connector/Request.java 2011-02-01 23:31:23 UTC (rev 1643) +++ branches/2.1.x/java/org/apache/catalina/connector/Request.java 2011-02-01 23:31:35 UTC (rev 1644) @@ -2651,7 +2651,12 @@ int semi = entry.indexOf(";q="); if (semi >= 0) { try { - quality = Double.parseDouble(entry.substring(semi + 3)); + String strQuality = entry.substring(semi + 3); + if (strQuality.length() <= 5) { + quality = Double.parseDouble(strQuality); + } else { + quality = 0.0; + } } catch (NumberFormatException e) { quality = 0.0; }

13 years, 3 months

1
0
0 / 0

JBossWeb SVN: r1643 - branches/JBOSSWEB_2_0_0_GA_CP/src/share/classes/org/apache/catalina/connector.

by jbossweb-commits＠lists.jboss.org

Author: remy.maucherat(a)jboss.com Date: 2011-02-01 18:31:23 -0500 (Tue, 01 Feb 2011) New Revision: 1643 Modified: branches/JBOSSWEB_2_0_0_GA_CP/src/share/classes/org/apache/catalina/connector/Request.java Log: - Filter out invalid locale header. Modified: branches/JBOSSWEB_2_0_0_GA_CP/src/share/classes/org/apache/catalina/connector/Request.java =================================================================== --- branches/JBOSSWEB_2_0_0_GA_CP/src/share/classes/org/apache/catalina/connector/Request.java 2011-02-01 23:25:56 UTC (rev 1642) +++ branches/JBOSSWEB_2_0_0_GA_CP/src/share/classes/org/apache/catalina/connector/Request.java 2011-02-01 23:31:23 UTC (rev 1643) @@ -2613,7 +2613,12 @@ int semi = entry.indexOf(";q="); if (semi >= 0) { try { - quality = Double.parseDouble(entry.substring(semi + 3)); + String strQuality = entry.substring(semi + 3); + if (strQuality.length() <= 5) { + quality = Double.parseDouble(strQuality); + } else { + quality = 0.0; + } } catch (NumberFormatException e) { quality = 0.0; }

13 years, 3 months

1
0
0 / 0

JBossWeb SVN: r1642 - trunk/java/org/apache/catalina/connector.

by jbossweb-commits＠lists.jboss.org

Author: remy.maucherat(a)jboss.com Date: 2011-02-01 18:25:56 -0500 (Tue, 01 Feb 2011) New Revision: 1642 Modified: trunk/java/org/apache/catalina/connector/Request.java Log: - Filter out invalid locale header. Modified: trunk/java/org/apache/catalina/connector/Request.java =================================================================== --- trunk/java/org/apache/catalina/connector/Request.java 2011-02-01 16:43:12 UTC (rev 1641) +++ trunk/java/org/apache/catalina/connector/Request.java 2011-02-01 23:25:56 UTC (rev 1642) @@ -3040,7 +3040,12 @@ int semi = entry.indexOf(";q="); if (semi >= 0) { try { - quality = Double.parseDouble(entry.substring(semi + 3)); + String strQuality = entry.substring(semi + 3); + if (strQuality.length() <= 5) { + quality = Double.parseDouble(strQuality); + } else { + quality = 0.0; + } } catch (NumberFormatException e) { quality = 0.0; }

13 years, 3 months

1
0
0 / 0

JBossWeb SVN: r1641 - in trunk: webapps/docs and 1 other directory.

by jbossweb-commits＠lists.jboss.org

Author: remy.maucherat(a)jboss.com Date: 2011-02-01 11:43:12 -0500 (Tue, 01 Feb 2011) New Revision: 1641 Modified: trunk/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java trunk/webapps/docs/changelog.xml Log: - Support new TLS renegotiation. Modified: trunk/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java =================================================================== --- trunk/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java 2011-01-27 15:24:30 UTC (rev 1640) +++ trunk/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java 2011-02-01 16:43:12 UTC (rev 1641) @@ -26,7 +26,9 @@ import java.net.ServerSocket; import java.net.Socket; import java.net.SocketException; +import java.security.KeyManagementException; import java.security.KeyStore; +import java.security.NoSuchAlgorithmException; import java.security.SecureRandom; import java.security.cert.CRL; import java.security.cert.CRLException; @@ -85,7 +87,7 @@ private static StringManager sm = StringManager.getManager("org.apache.tomcat.util.net.jsse.res"); - + private static final boolean RFC_5746_SUPPORTED; // defaults static String defaultProtocol = "TLS"; static boolean defaultClientAuth = false; @@ -99,6 +101,28 @@ static org.jboss.logging.Logger log = org.jboss.logging.Logger.getLogger(JSSESocketFactory.class); + static { + boolean result = false; + SSLContext context; + try { + context = SSLContext.getInstance("TLS"); + context.init(null, null, new SecureRandom()); + SSLServerSocketFactory ssf = context.getServerSocketFactory(); + String ciphers[] = ssf.getSupportedCipherSuites(); + for (String cipher : ciphers) { + if ("TLS_EMPTY_RENEGOTIATION_INFO_SCSV".equals(cipher)) { + result = true; + break; + } + } + } catch (NoSuchAlgorithmException e) { + // Assume no RFC 5746 support + } catch (KeyManagementException e) { + // Assume no RFC 5746 support + } + RFC_5746_SUPPORTED = result; + } + protected boolean initialized; protected String clientAuth = "false"; protected SSLServerSocketFactory sslProxy = null; @@ -166,8 +190,8 @@ if (session.getCipherSuite().equals("SSL_NULL_WITH_NULL_NULL")) throw new IOException("SSL handshake failed. Ciper suite in SSL Session is SSL_NULL_WITH_NULL_NULL"); - if (!allowUnsafeLegacyRenegotiation) { - // Prevent futher handshakes by removing all cipher suites + if (!allowUnsafeLegacyRenegotiation && !RFC_5746_SUPPORTED) { + // Prevent further handshakes by removing all cipher suites ((SSLSocket) sock).setEnabledCipherSuites(new String[0]); } } Modified: trunk/webapps/docs/changelog.xml =================================================================== --- trunk/webapps/docs/changelog.xml 2011-01-27 15:24:30 UTC (rev 1640) +++ trunk/webapps/docs/changelog.xml 2011-02-01 16:43:12 UTC (rev 1641) @@ -76,6 +76,9 @@ <fix> <jira>186</jira>: Fix wait logic in pause() and add configuration. (jfclere) </fix> + <fix> + Allow using the new TLS renegotiation (RFC 5746) if available. (markt) + </fix> </changelog> </subsection> <subsection name="Jasper">

13 years, 3 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

jbossweb-commits February 2011