January 2015 - jbossweb-commits - Jboss List Archives

JBossWeb SVN: r2587 - tags/JBOSSWEB_7_5_5_FINAL/src/main/java/org/apache/tomcat/websocket.

by jbossweb-commits＠lists.jboss.org

Author: remy.maucherat(a)jboss.com Date: 2015-01-27 07:51:50 -0500 (Tue, 27 Jan 2015) New Revision: 2587 Modified: tags/JBOSSWEB_7_5_5_FINAL/src/main/java/org/apache/tomcat/websocket/WsWebSocketContainer.java Log: [hack the tag since it is not really released yet] BZ1155189: As found out by Radim Hatlapatka, entropy can cause a delay in the middle of an IO operation. Move the entropy problem to the initial connection (unless the client sends messages concurrently). Modified: tags/JBOSSWEB_7_5_5_FINAL/src/main/java/org/apache/tomcat/websocket/WsWebSocketContainer.java =================================================================== --- tags/JBOSSWEB_7_5_5_FINAL/src/main/java/org/apache/tomcat/websocket/WsWebSocketContainer.java 2015-01-27 12:47:55 UTC (rev 2586) +++ tags/JBOSSWEB_7_5_5_FINAL/src/main/java/org/apache/tomcat/websocket/WsWebSocketContainer.java 2015-01-27 12:51:50 UTC (rev 2587) @@ -209,6 +209,9 @@ boolean secure = false; + // Entropy can cause a delay, so initialize here at least one random + Util.generateMask(); + String scheme = path.getScheme(); if (!("ws".equalsIgnoreCase(scheme) || "wss".equalsIgnoreCase(scheme))) {

10 years, 9 months

1
0
0 / 0

JBossWeb SVN: r2586 - branches/7.5.x/src/main/java/org/apache/tomcat/websocket.

by jbossweb-commits＠lists.jboss.org

Author: remy.maucherat(a)jboss.com Date: 2015-01-27 07:47:55 -0500 (Tue, 27 Jan 2015) New Revision: 2586 Modified: branches/7.5.x/src/main/java/org/apache/tomcat/websocket/WsWebSocketContainer.java Log: BZ1155189: As found out by Radim Hatlapatka, entropy can cause a delay in the middle of an IO operation. Move the entropy problem to the initial connection (unless the client sends messages concurrently). Modified: branches/7.5.x/src/main/java/org/apache/tomcat/websocket/WsWebSocketContainer.java =================================================================== --- branches/7.5.x/src/main/java/org/apache/tomcat/websocket/WsWebSocketContainer.java 2015-01-27 09:22:22 UTC (rev 2585) +++ branches/7.5.x/src/main/java/org/apache/tomcat/websocket/WsWebSocketContainer.java 2015-01-27 12:47:55 UTC (rev 2586) @@ -209,6 +209,9 @@ boolean secure = false; + // Entropy can cause a delay, so initialize here at least one random + Util.generateMask(); + String scheme = path.getScheme(); if (!("ws".equalsIgnoreCase(scheme) || "wss".equalsIgnoreCase(scheme))) {

10 years, 9 months

1
0
0 / 0

JBossWeb SVN: r2585 - tags.

by jbossweb-commits＠lists.jboss.org

Author: remy.maucherat(a)jboss.com Date: 2015-01-27 04:22:22 -0500 (Tue, 27 Jan 2015) New Revision: 2585 Added: tags/JBOSSWEB_7_5_5_FINAL/ Log: New web build.

10 years, 9 months

1
0
0 / 0

JBossWeb SVN: r2584 - branches/7.5.x.

by jbossweb-commits＠lists.jboss.org

Author: remy.maucherat(a)jboss.com Date: 2015-01-27 04:19:56 -0500 (Tue, 27 Jan 2015) New Revision: 2584 Modified: branches/7.5.x/pom.xml Log: New web build. Modified: branches/7.5.x/pom.xml =================================================================== --- branches/7.5.x/pom.xml 2015-01-20 16:45:35 UTC (rev 2583) +++ branches/7.5.x/pom.xml 2015-01-27 09:19:56 UTC (rev 2584) @@ -33,7 +33,7 @@ <groupId>org.jboss.web</groupId> <artifactId>jbossweb</artifactId> - <version>7.5.4.Final</version> + <version>7.5.5.Final</version> <name>JBoss Web</name> <description>Servlet 3.0 container</description>

10 years, 9 months

1
0
0 / 0

JBossWeb SVN: r2583 - branches/7.5.x/src/main/java/org/apache/tomcat/websocket/server.

by jbossweb-commits＠lists.jboss.org

Author: remy.maucherat(a)jboss.com Date: 2015-01-20 11:45:35 -0500 (Tue, 20 Jan 2015) New Revision: 2583 Modified: branches/7.5.x/src/main/java/org/apache/tomcat/websocket/server/WsRemoteEndpointImplServer.java Log: BZ1182241: Improve compatibility with buffered streams (as used in web) Modified: branches/7.5.x/src/main/java/org/apache/tomcat/websocket/server/WsRemoteEndpointImplServer.java =================================================================== --- branches/7.5.x/src/main/java/org/apache/tomcat/websocket/server/WsRemoteEndpointImplServer.java 2015-01-20 16:14:18 UTC (rev 2582) +++ branches/7.5.x/src/main/java/org/apache/tomcat/websocket/server/WsRemoteEndpointImplServer.java 2015-01-20 16:45:35 UTC (rev 2583) @@ -101,12 +101,14 @@ } } if (complete) { - wsWriteTimeout.unregister(this); - clearHandler(null, useDispatch); - // Explicit flush for compatibility with buffered streams sos.flush(); - if (close) { - close(); + complete = sos.isReady(); + if (complete) { + wsWriteTimeout.unregister(this); + clearHandler(null, useDispatch); + if (close) { + close(); + } } break; }

10 years, 9 months

1
0
0 / 0

JBossWeb SVN: r2582 - branches/7.5.x/src/main/java/org/apache/tomcat/util/net.

by jbossweb-commits＠lists.jboss.org

Author: jfclere Date: 2015-01-20 11:14:18 -0500 (Tue, 20 Jan 2015) New Revision: 2582 Modified: branches/7.5.x/src/main/java/org/apache/tomcat/util/net/AprEndpoint.java Log: Fix the regression BZ 1174169 introduced by 1158847 on pre 1.0.1 openssl. Modified: branches/7.5.x/src/main/java/org/apache/tomcat/util/net/AprEndpoint.java =================================================================== --- branches/7.5.x/src/main/java/org/apache/tomcat/util/net/AprEndpoint.java 2015-01-07 13:33:43 UTC (rev 2581) +++ branches/7.5.x/src/main/java/org/apache/tomcat/util/net/AprEndpoint.java 2015-01-20 16:14:18 UTC (rev 2582) @@ -573,7 +573,10 @@ // SSL protocol int value = SSL.SSL_PROTOCOL_NONE; if (SSLProtocol == null || SSLProtocol.length() == 0) { - value = SSL.SSL_PROTOCOL_ALL; + if (SSL.version() < 0x1000100fL) + value |= SSL.SSL_PROTOCOL_TLSV1; + else + value |= SSL.SSL_PROTOCOL_ALL; } else { String protocols = SSLProtocol.replace(',', '+'); for (String protocol : protocols.split("\\+")) { @@ -589,7 +592,10 @@ } else if ("TLSv1.2".equalsIgnoreCase(protocol)) { value |= SSL.SSL_PROTOCOL_TLSV1_2; } else if ("all".equalsIgnoreCase(protocol)) { - value |= SSL.SSL_PROTOCOL_ALL; + if (SSL.version() < 0x1000100fL) + value = SSL.SSL_PROTOCOL_TLSV1; + else + value = SSL.SSL_PROTOCOL_ALL; } else { // Protocol not recognized, fail to start as it is safer than // continuing with the default which might enable more than the

10 years, 9 months

1
0
0 / 0

JBossWeb SVN: r2581 - branches/7.5.x/src/main/java/org/apache/tomcat/util/net.

by jbossweb-commits＠lists.jboss.org

Author: remy.maucherat(a)jboss.com Date: 2015-01-07 08:33:43 -0500 (Wed, 07 Jan 2015) New Revision: 2581 Modified: branches/7.5.x/src/main/java/org/apache/tomcat/util/net/AprEndpoint.java Log: BZ1174184: Unlike the other connectors, the APR connector binds the socket first, then processes the SSL configuration. Reverse that. Modified: branches/7.5.x/src/main/java/org/apache/tomcat/util/net/AprEndpoint.java =================================================================== --- branches/7.5.x/src/main/java/org/apache/tomcat/util/net/AprEndpoint.java 2015-01-06 16:22:34 UTC (rev 2580) +++ branches/7.5.x/src/main/java/org/apache/tomcat/util/net/AprEndpoint.java 2015-01-07 13:33:43 UTC (rev 2581) @@ -567,57 +567,6 @@ } } - // Sendfile usage on systems which don't support it cause major problems - if (useSendfile && !Library.APR_HAS_SENDFILE) { - useSendfile = false; - } - - long inetAddress = Address.info(addressStr, family, - port, 0, rootPool); - - if (!reverseConnection) { - // Create the APR server socket - serverSock = Socket.create(Address.getInfo(inetAddress).family, Socket.SOCK_STREAM, - Socket.APR_PROTO_TCP, rootPool); - if (OS.IS_UNIX) { - Socket.optSet(serverSock, Socket.APR_SO_REUSEADDR, 1); - } - // Deal with the firewalls that tend to drop the inactive sockets - Socket.optSet(serverSock, Socket.APR_SO_KEEPALIVE, 1); - // Bind the server socket - int ret = Socket.bind(serverSock, inetAddress); - if (ret != 0) { - throw MESSAGES.socketBindFailed(ret, Error.strerror(ret)); - } - // Start listening on the server socket - ret = Socket.listen(serverSock, backlog); - if (ret != 0) { - throw MESSAGES.socketListenFailed(ret, Error.strerror(ret)); - } - if (OS.IS_WIN32 || OS.IS_WIN64) { - // On Windows set the reuseaddr flag after the bind/listen - Socket.optSet(serverSock, Socket.APR_SO_REUSEADDR, 1); - } - - // Delay accepting of new connections until data is available - // Only Linux kernels 2.4 + have that implemented - // on other platforms this call is noop and will return APR_ENOTIMPL. - if (deferAccept && (Socket.optSet(serverSock, Socket.APR_TCP_DEFER_ACCEPT, 1) == Status.APR_ENOTIMPL)) { - deferAccept = false; - } - } else { - /* Initialize the SockList */ - listsock = new ListSock[10]; - for (int i=0; i<listsock.length; i++) { - listsock[i] = new ListSock(); - listsock[i].port = port + i; - listsock[i].count = 0; - } - serverAddress = inetAddress; - serverAddressFamily = family; - deferAccept = false; - } - // Initialize SSL if needed if (SSLEnabled) { @@ -686,6 +635,57 @@ } + // Sendfile usage on systems which don't support it cause major problems + if (useSendfile && !Library.APR_HAS_SENDFILE) { + useSendfile = false; + } + + long inetAddress = Address.info(addressStr, family, + port, 0, rootPool); + + if (!reverseConnection) { + // Create the APR server socket + serverSock = Socket.create(Address.getInfo(inetAddress).family, Socket.SOCK_STREAM, + Socket.APR_PROTO_TCP, rootPool); + if (OS.IS_UNIX) { + Socket.optSet(serverSock, Socket.APR_SO_REUSEADDR, 1); + } + // Deal with the firewalls that tend to drop the inactive sockets + Socket.optSet(serverSock, Socket.APR_SO_KEEPALIVE, 1); + // Bind the server socket + int ret = Socket.bind(serverSock, inetAddress); + if (ret != 0) { + throw MESSAGES.socketBindFailed(ret, Error.strerror(ret)); + } + // Start listening on the server socket + ret = Socket.listen(serverSock, backlog); + if (ret != 0) { + throw MESSAGES.socketListenFailed(ret, Error.strerror(ret)); + } + if (OS.IS_WIN32 || OS.IS_WIN64) { + // On Windows set the reuseaddr flag after the bind/listen + Socket.optSet(serverSock, Socket.APR_SO_REUSEADDR, 1); + } + + // Delay accepting of new connections until data is available + // Only Linux kernels 2.4 + have that implemented + // on other platforms this call is noop and will return APR_ENOTIMPL. + if (deferAccept && (Socket.optSet(serverSock, Socket.APR_TCP_DEFER_ACCEPT, 1) == Status.APR_ENOTIMPL)) { + deferAccept = false; + } + } else { + /* Initialize the SockList */ + listsock = new ListSock[10]; + for (int i=0; i<listsock.length; i++) { + listsock[i] = new ListSock(); + listsock[i].port = port + i; + listsock[i].count = 0; + } + serverAddress = inetAddress; + serverAddressFamily = family; + deferAccept = false; + } + initialized = true; } @@ -796,7 +796,9 @@ Pool.destroy(serverSockPool); serverSockPool = 0; // Close server socket - Socket.close(serverSock); + if (serverSock != 0) { + Socket.close(serverSock); + } serverSock = 0; sslContext = 0; // Close all APR memory pools and resources

10 years, 10 months

1
0
0 / 0

JBossWeb SVN: r2580 - tags.

by jbossweb-commits＠lists.jboss.org

Author: remy.maucherat(a)jboss.com Date: 2015-01-06 11:22:34 -0500 (Tue, 06 Jan 2015) New Revision: 2580 Added: tags/JBOSSWEB_7_4_10_FINAL/ Log: 7.4.10 build.

10 years, 10 months

1
0
0 / 0

JBossWeb SVN: r2579 - branches/7.4.x.

by jbossweb-commits＠lists.jboss.org

Author: remy.maucherat(a)jboss.com Date: 2015-01-06 09:52:27 -0500 (Tue, 06 Jan 2015) New Revision: 2579 Modified: branches/7.4.x/pom.xml Log: 7.4.10 build. Modified: branches/7.4.x/pom.xml =================================================================== --- branches/7.4.x/pom.xml 2015-01-06 14:49:10 UTC (rev 2578) +++ branches/7.4.x/pom.xml 2015-01-06 14:52:27 UTC (rev 2579) @@ -33,7 +33,7 @@ <groupId>org.jboss.web</groupId> <artifactId>jbossweb</artifactId> - <version>7.4.9.Final</version> + <version>7.4.10.Final</version> <name>JBoss Web</name> <description>Servlet 3.0 container</description>

10 years, 10 months

1
0
0 / 0

JBossWeb SVN: r2578 - branches/7.4.x/src/main/java/org/apache/coyote/http11.

by jbossweb-commits＠lists.jboss.org

Author: remy.maucherat(a)jboss.com Date: 2015-01-06 09:49:10 -0500 (Tue, 06 Jan 2015) New Revision: 2578 Modified: branches/7.4.x/src/main/java/org/apache/coyote/http11/Http11NioProcessor.java Log: Port BZ1167203: Add another missing infinite timeout for NIO2. Modified: branches/7.4.x/src/main/java/org/apache/coyote/http11/Http11NioProcessor.java =================================================================== --- branches/7.4.x/src/main/java/org/apache/coyote/http11/Http11NioProcessor.java 2014-12-17 16:14:56 UTC (rev 2577) +++ branches/7.4.x/src/main/java/org/apache/coyote/http11/Http11NioProcessor.java 2015-01-06 14:49:10 UTC (rev 2578) @@ -870,6 +870,7 @@ // Switch to raw bytes mode inputBuffer.removeActiveFilters(); outputBuffer.removeActiveFilters(); + timeout = Integer.MAX_VALUE; } }

10 years, 10 months

1
0
0 / 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

jbossweb-commits January 2015