March 2014 - jbossweb-commits - Jboss List Archives

by jbossweb-commits＠lists.jboss.org

Author: remy.maucherat(a)jboss.com Date: 2014-03-13 10:47:32 -0400 (Thu, 13 Mar 2014) New Revision: 2387 Modified: branches/7.3.x/pom.xml Log: New build. Modified: branches/7.3.x/pom.xml =================================================================== --- branches/7.3.x/pom.xml 2014-03-13 14:47:14 UTC (rev 2386) +++ branches/7.3.x/pom.xml 2014-03-13 14:47:32 UTC (rev 2387) @@ -33,7 +33,7 @@ <groupId>org.jboss.web</groupId> <artifactId>jbossweb</artifactId> - <version>7.3.0.Final</version> + <version>7.3.1.Final</version> <name>JBoss Web</name> <description>Servlet 3.0 container</description>

10 years, 9 months

1
0
0 / 0

JBossWeb SVN: r2386 - in branches/7.3.x/src/main/java/org/apache/coyote: ajp and 1 other directories.

by jbossweb-commits＠lists.jboss.org

Author: remy.maucherat(a)jboss.com Date: 2014-03-13 10:47:14 -0400 (Thu, 13 Mar 2014) New Revision: 2386 Modified: branches/7.3.x/src/main/java/org/apache/coyote/Request.java branches/7.3.x/src/main/java/org/apache/coyote/ajp/AjpAprProcessor.java branches/7.3.x/src/main/java/org/apache/coyote/ajp/AjpProcessor.java branches/7.3.x/src/main/java/org/apache/coyote/http11/Http11AprProcessor.java branches/7.3.x/src/main/java/org/apache/coyote/http11/Http11NioProcessor.java branches/7.3.x/src/main/java/org/apache/coyote/http11/Http11Processor.java Log: Port content-length processing tightening patch. Modified: branches/7.3.x/src/main/java/org/apache/coyote/Request.java =================================================================== --- branches/7.3.x/src/main/java/org/apache/coyote/Request.java 2014-03-13 14:32:46 UTC (rev 2385) +++ branches/7.3.x/src/main/java/org/apache/coyote/Request.java 2014-03-13 14:47:14 UTC (rev 2386) @@ -288,7 +288,7 @@ } - public void setContentLength(int len) { + public void setContentLength(long len) { this.contentLength = len; } Modified: branches/7.3.x/src/main/java/org/apache/coyote/ajp/AjpAprProcessor.java =================================================================== --- branches/7.3.x/src/main/java/org/apache/coyote/ajp/AjpAprProcessor.java 2014-03-13 14:32:46 UTC (rev 2385) +++ branches/7.3.x/src/main/java/org/apache/coyote/ajp/AjpAprProcessor.java 2014-03-13 14:47:14 UTC (rev 2386) @@ -28,6 +28,8 @@ import java.security.cert.CertificateFactory; import java.security.cert.X509Certificate; +import javax.servlet.http.HttpServletResponse; + import org.apache.coyote.ActionCode; import org.apache.coyote.ActionHook; import org.apache.coyote.Adapter; @@ -721,6 +723,7 @@ // Decode headers MimeHeaders headers = request.getMimeHeaders(); + boolean contentLengthSet = false; int hCount = requestHeaderMessage.getInt(); for(int i = 0 ; i < hCount ; i++) { String hName = null; @@ -755,8 +758,15 @@ if (hId == Constants.SC_REQ_CONTENT_LENGTH || (hId == -1 && tmpMB.equalsIgnoreCase("Content-Length"))) { - // just read the content-length header, so set it - request.setContentLength( vMB.getInt() ); + long cl = vMB.getLong(); + if (contentLengthSet) { + response.setStatus(HttpServletResponse.SC_BAD_REQUEST); + error = true; + } else { + contentLengthSet = true; + // Set the content-length header for the request + request.setContentLength(cl); + } } else if (hId == Constants.SC_REQ_CONTENT_TYPE || (hId == -1 && tmpMB.equalsIgnoreCase("Content-Type"))) { // just read the content-type header, so set it Modified: branches/7.3.x/src/main/java/org/apache/coyote/ajp/AjpProcessor.java =================================================================== --- branches/7.3.x/src/main/java/org/apache/coyote/ajp/AjpProcessor.java 2014-03-13 14:32:46 UTC (rev 2385) +++ branches/7.3.x/src/main/java/org/apache/coyote/ajp/AjpProcessor.java 2014-03-13 14:47:14 UTC (rev 2386) @@ -30,6 +30,8 @@ import java.security.cert.CertificateFactory; import java.security.cert.X509Certificate; +import javax.servlet.http.HttpServletResponse; + import org.apache.coyote.ActionCode; import org.apache.coyote.ActionHook; import org.apache.coyote.Adapter; @@ -735,6 +737,7 @@ // Decode headers MimeHeaders headers = request.getMimeHeaders(); + boolean contentLengthSet = false; int hCount = requestHeaderMessage.getInt(); for(int i = 0 ; i < hCount ; i++) { String hName = null; @@ -769,8 +772,15 @@ if (hId == Constants.SC_REQ_CONTENT_LENGTH || (hId == -1 && tmpMB.equalsIgnoreCase("Content-Length"))) { - // just read the content-length header, so set it - request.setContentLength( vMB.getInt() ); + long cl = vMB.getLong(); + if (contentLengthSet) { + response.setStatus(HttpServletResponse.SC_BAD_REQUEST); + error = true; + } else { + contentLengthSet = true; + // Set the content-length header for the request + request.setContentLength(cl); + } } else if (hId == Constants.SC_REQ_CONTENT_TYPE || (hId == -1 && tmpMB.equalsIgnoreCase("Content-Type"))) { // just read the content-type header, so set it Modified: branches/7.3.x/src/main/java/org/apache/coyote/http11/Http11AprProcessor.java =================================================================== --- branches/7.3.x/src/main/java/org/apache/coyote/http11/Http11AprProcessor.java 2014-03-13 14:32:46 UTC (rev 2385) +++ branches/7.3.x/src/main/java/org/apache/coyote/http11/Http11AprProcessor.java 2014-03-13 14:47:14 UTC (rev 2386) @@ -1468,10 +1468,19 @@ // Parse content-length header long contentLength = request.getContentLengthLong(); - if (contentLength >= 0 && !contentDelimitation) { - inputBuffer.addActiveFilter - (inputFilters[Constants.IDENTITY_FILTER]); - contentDelimitation = true; + if (contentLength >= 0) { + if (contentDelimitation) { + // contentDelimitation being true at this point indicates that + // chunked encoding is being used but chunked encoding should + // not be used with a content length. RFC 2616, section 4.4, + // bullet 3 states Content-Length must be ignored in this case - + // so remove it. + headers.removeHeader("content-length"); + request.setContentLength(-1); + } else { + inputBuffer.addActiveFilter(inputFilters[Constants.IDENTITY_FILTER]); + contentDelimitation = true; + } } MessageBytes valueMB = headers.getValue("host"); Modified: branches/7.3.x/src/main/java/org/apache/coyote/http11/Http11NioProcessor.java =================================================================== --- branches/7.3.x/src/main/java/org/apache/coyote/http11/Http11NioProcessor.java 2014-03-13 14:32:46 UTC (rev 2385) +++ branches/7.3.x/src/main/java/org/apache/coyote/http11/Http11NioProcessor.java 2014-03-13 14:47:14 UTC (rev 2386) @@ -1004,12 +1004,22 @@ } } - // Parse content-length header - long contentLength = request.getContentLengthLong(); - if (contentLength >= 0 && !contentDelimitation) { - inputBuffer.addActiveFilter(inputFilters[Constants.IDENTITY_FILTER]); - contentDelimitation = true; - } + // Parse content-length header + long contentLength = request.getContentLengthLong(); + if (contentLength >= 0) { + if (contentDelimitation) { + // contentDelimitation being true at this point indicates that + // chunked encoding is being used but chunked encoding should + // not be used with a content length. RFC 2616, section 4.4, + // bullet 3 states Content-Length must be ignored in this case - + // so remove it. + headers.removeHeader("content-length"); + request.setContentLength(-1); + } else { + inputBuffer.addActiveFilter(inputFilters[Constants.IDENTITY_FILTER]); + contentDelimitation = true; + } + } MessageBytes valueMB = headers.getValue("host"); Modified: branches/7.3.x/src/main/java/org/apache/coyote/http11/Http11Processor.java =================================================================== --- branches/7.3.x/src/main/java/org/apache/coyote/http11/Http11Processor.java 2014-03-13 14:32:46 UTC (rev 2385) +++ branches/7.3.x/src/main/java/org/apache/coyote/http11/Http11Processor.java 2014-03-13 14:47:14 UTC (rev 2386) @@ -1328,10 +1328,19 @@ // Parse content-length header long contentLength = request.getContentLengthLong(); - if (contentLength >= 0 && !contentDelimitation) { - inputBuffer.addActiveFilter - (inputFilters[Constants.IDENTITY_FILTER]); - contentDelimitation = true; + if (contentLength >= 0) { + if (contentDelimitation) { + // contentDelimitation being true at this point indicates that + // chunked encoding is being used but chunked encoding should + // not be used with a content length. RFC 2616, section 4.4, + // bullet 3 states Content-Length must be ignored in this case - + // so remove it. + headers.removeHeader("content-length"); + request.setContentLength(-1); + } else { + inputBuffer.addActiveFilter(inputFilters[Constants.IDENTITY_FILTER]); + contentDelimitation = true; + } } MessageBytes valueMB = headers.getValue("host");

10 years, 9 months

1
0
0 / 0

JBossWeb SVN: r2385 - in branches/7.3.x/src/main/java/org: jboss/web and 1 other directory.

by jbossweb-commits＠lists.jboss.org

Author: remy.maucherat(a)jboss.com Date: 2014-03-13 10:32:46 -0400 (Thu, 13 Mar 2014) New Revision: 2385 Modified: branches/7.3.x/src/main/java/org/apache/tomcat/util/http/fileupload/FileUploadBase.java branches/7.3.x/src/main/java/org/apache/tomcat/util/http/fileupload/MultipartStream.java branches/7.3.x/src/main/java/org/jboss/web/FileUploadMessages.java Log: Port fileupload fix. Modified: branches/7.3.x/src/main/java/org/apache/tomcat/util/http/fileupload/FileUploadBase.java =================================================================== --- branches/7.3.x/src/main/java/org/apache/tomcat/util/http/fileupload/FileUploadBase.java 2014-03-13 10:59:45 UTC (rev 2384) +++ branches/7.3.x/src/main/java/org/apache/tomcat/util/http/fileupload/FileUploadBase.java 2014-03-13 14:32:46 UTC (rev 2385) @@ -795,7 +795,11 @@ notifier = new MultipartStream.ProgressNotifier(listener, ctx.getContentLength()); - multi = new MultipartStream(input, boundary, notifier); + try { + multi = new MultipartStream(input, boundary, notifier); + } catch (IllegalArgumentException iae) { + throw new InvalidContentTypeException(MESSAGES.invalidBoundary(CONTENT_TYPE), iae); + } multi.setHeaderEncoding(charEncoding); skipPreamble = true; @@ -969,7 +973,7 @@ * detail message. */ public InvalidContentTypeException() { - // Nothing to do. + super(); } /** @@ -981,8 +985,12 @@ public InvalidContentTypeException(String message) { super(message); } - } + public InvalidContentTypeException(String message, Exception cause) { + super(message, cause); + } + } + /** * Thrown to indicate an IOException. */ Modified: branches/7.3.x/src/main/java/org/apache/tomcat/util/http/fileupload/MultipartStream.java =================================================================== --- branches/7.3.x/src/main/java/org/apache/tomcat/util/http/fileupload/MultipartStream.java 2014-03-13 10:59:45 UTC (rev 2384) +++ branches/7.3.x/src/main/java/org/apache/tomcat/util/http/fileupload/MultipartStream.java 2014-03-13 14:32:46 UTC (rev 2385) @@ -302,8 +302,11 @@ // We prepend CR/LF to the boundary to chop trailing CR/LF from // body-data tokens. - this.boundary = new byte[boundary.length + BOUNDARY_PREFIX.length]; this.boundaryLength = boundary.length + BOUNDARY_PREFIX.length; + if (bufSize < this.boundaryLength + 1) { + throw MESSAGES.multipartStreamBufferSizeTooSmall(); + } + this.boundary = new byte[this.boundaryLength]; this.keepRegion = this.boundary.length; System.arraycopy(BOUNDARY_PREFIX, 0, this.boundary, 0, BOUNDARY_PREFIX.length); Modified: branches/7.3.x/src/main/java/org/jboss/web/FileUploadMessages.java =================================================================== --- branches/7.3.x/src/main/java/org/jboss/web/FileUploadMessages.java 2014-03-13 10:59:45 UTC (rev 2384) +++ branches/7.3.x/src/main/java/org/jboss/web/FileUploadMessages.java 2014-03-13 14:32:46 UTC (rev 2385) @@ -18,7 +18,6 @@ package org.jboss.web; -import org.jboss.logging.Cause; import org.jboss.logging.Message; import org.jboss.logging.MessageBundle; import org.jboss.logging.Messages; @@ -122,4 +121,10 @@ @Message(id = 8228, value = "Invalid file name: %s") String invalidFileName(String fileName); + @Message(id = 8229, value = "The boundary specified in the %s header is too long") + String invalidBoundary(String header); + + @Message(id = 8230, value = "The buffer size specified for the MultipartStream is too small") + IllegalArgumentException multipartStreamBufferSizeTooSmall(); + }

10 years, 9 months

1
0
0 / 0

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

by jbossweb-commits＠lists.jboss.org

Author: remy.maucherat(a)jboss.com Date: 2014-03-13 06:59:45 -0400 (Thu, 13 Mar 2014) New Revision: 2384 Modified: branches/7.4.x/src/main/java/org/apache/tomcat/util/net/NioEndpoint.java Log: Avoid shutdown of an external executor. Modified: branches/7.4.x/src/main/java/org/apache/tomcat/util/net/NioEndpoint.java =================================================================== --- branches/7.4.x/src/main/java/org/apache/tomcat/util/net/NioEndpoint.java 2014-03-12 17:33:18 UTC (rev 2383) +++ branches/7.4.x/src/main/java/org/apache/tomcat/util/net/NioEndpoint.java 2014-03-13 10:59:45 UTC (rev 2384) @@ -84,6 +84,11 @@ protected Sendfile sendfile; /** + * Using an internal executor. + */ + protected boolean internalExecutor = false; + + /** * Create a new instance of {@code NioEndpoint} */ public NioEndpoint() { @@ -181,6 +186,7 @@ // If the executor is not set, create it with a fixed thread pool if (this.executor == null) { + internalExecutor = true; this.executor = Executors.newFixedThreadPool(this.maxThreads, this.threadFactory); } @@ -297,7 +303,11 @@ this.serverSocketChannelFactory = null; // Shut down the executor - ((ExecutorService) this.executor).shutdown(); + if (internalExecutor) { + ((ExecutorService) this.executor).shutdown(); + executor = null; + internalExecutor = false; + } initialized = false; }

10 years, 9 months

1
0
0 / 0

JBossWeb SVN: r2383 - branches/7.4.x/src/main/java/org/jboss/web.

by jbossweb-commits＠lists.jboss.org

Author: jfrederic.clere(a)jboss.com Date: 2014-03-12 13:33:18 -0400 (Wed, 12 Mar 2014) New Revision: 2383 Modified: branches/7.4.x/src/main/java/org/jboss/web/CoyoteLogger.java Log: Fix for 1073396. Modified: branches/7.4.x/src/main/java/org/jboss/web/CoyoteLogger.java =================================================================== --- branches/7.4.x/src/main/java/org/jboss/web/CoyoteLogger.java 2014-03-12 17:13:23 UTC (rev 2382) +++ branches/7.4.x/src/main/java/org/jboss/web/CoyoteLogger.java 2014-03-12 17:33:18 UTC (rev 2383) @@ -138,7 +138,7 @@ @Message(id = 3010, value = "Poller creation failed") void errorCreatingPoller(@Cause Throwable exception); - @LogMessage(level = ERROR) + @LogMessage(level = DEBUG) @Message(id = 3011, value = "Error allocating socket processor") void errorProcessingSocket(@Cause Throwable exception);

10 years, 9 months

1
0
0 / 0

JBossWeb SVN: r2382 - branches/7.4.x/src/main/java/org/jboss/web.

by jbossweb-commits＠lists.jboss.org

Author: jfrederic.clere(a)jboss.com Date: 2014-03-12 13:13:23 -0400 (Wed, 12 Mar 2014) New Revision: 2382 Modified: branches/7.4.x/src/main/java/org/jboss/web/CoyoteLogger.java Log: fix for BZ 1065932. Basically the one possible error is that we have closed the acceptor socket because we are stopping. Modified: branches/7.4.x/src/main/java/org/jboss/web/CoyoteLogger.java =================================================================== --- branches/7.4.x/src/main/java/org/jboss/web/CoyoteLogger.java 2014-03-11 13:49:17 UTC (rev 2381) +++ branches/7.4.x/src/main/java/org/jboss/web/CoyoteLogger.java 2014-03-12 17:13:23 UTC (rev 2382) @@ -142,7 +142,7 @@ @Message(id = 3011, value = "Error allocating socket processor") void errorProcessingSocket(@Cause Throwable exception); - @LogMessage(level = ERROR) + @LogMessage(level = DEBUG) @Message(id = 3012, value = "Socket accept failed") void errorAcceptingSocket(@Cause Throwable exception);

10 years, 9 months

1
0
0 / 0

JBossWeb SVN: r2381 - branches/7.4.x/src/main/java/org/apache/catalina/connector.

by jbossweb-commits＠lists.jboss.org

Author: remy.maucherat(a)jboss.com Date: 2014-03-11 09:49:17 -0400 (Tue, 11 Mar 2014) New Revision: 2381 Modified: branches/7.4.x/src/main/java/org/apache/catalina/connector/CoyoteOutputStream.java Log: Avoid pointless NPEs after recycle. Modified: branches/7.4.x/src/main/java/org/apache/catalina/connector/CoyoteOutputStream.java =================================================================== --- branches/7.4.x/src/main/java/org/apache/catalina/connector/CoyoteOutputStream.java 2014-03-11 10:43:37 UTC (rev 2380) +++ branches/7.4.x/src/main/java/org/apache/catalina/connector/CoyoteOutputStream.java 2014-03-11 13:49:17 UTC (rev 2381) @@ -107,7 +107,7 @@ public boolean isReady() { - return (ob.lastWrite() > 0); + return (ob != null && ob.lastWrite() > 0); }

10 years, 9 months

1
0
0 / 0

JBossWeb SVN: r2380 - branches/7.4.x/src/main/java/org/apache/tomcat/util/net/jsse.

by jbossweb-commits＠lists.jboss.org

Author: jfrederic.clere(a)jboss.com Date: 2014-03-11 06:43:37 -0400 (Tue, 11 Mar 2014) New Revision: 2380 Modified: branches/7.4.x/src/main/java/org/apache/tomcat/util/net/jsse/NioJSSESocketChannelFactory.java Log: really fix BZ 1072310. Modified: branches/7.4.x/src/main/java/org/apache/tomcat/util/net/jsse/NioJSSESocketChannelFactory.java =================================================================== --- branches/7.4.x/src/main/java/org/apache/tomcat/util/net/jsse/NioJSSESocketChannelFactory.java 2014-03-11 10:15:43 UTC (rev 2379) +++ branches/7.4.x/src/main/java/org/apache/tomcat/util/net/jsse/NioJSSESocketChannelFactory.java 2014-03-11 10:43:37 UTC (rev 2380) @@ -781,8 +781,11 @@ // we don't know if client authentication is needed - // after parsing the request we may re-handshake - engine.setNeedClientAuth(requireClientAuth); - engine.setWantClientAuth(wantClientAuth); + if (wantClientAuth) { + engine.setWantClientAuth(wantClientAuth); + } else { + engine.setNeedClientAuth(requireClientAuth); + } } /**

10 years, 9 months

1
0
0 / 0

JBossWeb SVN: r2379 - branches/7.4.x/src/main/java/org/apache/tomcat/util/net/jsse.

by jbossweb-commits＠lists.jboss.org

Author: jfrederic.clere(a)jboss.com Date: 2014-03-11 06:15:43 -0400 (Tue, 11 Mar 2014) New Revision: 2379 Modified: branches/7.4.x/src/main/java/org/apache/tomcat/util/net/jsse/NioJSSESocketChannelFactory.java Log: fix for BZ 1072310. Modified: branches/7.4.x/src/main/java/org/apache/tomcat/util/net/jsse/NioJSSESocketChannelFactory.java =================================================================== --- branches/7.4.x/src/main/java/org/apache/tomcat/util/net/jsse/NioJSSESocketChannelFactory.java 2014-03-10 14:49:05 UTC (rev 2378) +++ branches/7.4.x/src/main/java/org/apache/tomcat/util/net/jsse/NioJSSESocketChannelFactory.java 2014-03-11 10:15:43 UTC (rev 2379) @@ -781,8 +781,8 @@ // we don't know if client authentication is needed - // after parsing the request we may re-handshake + engine.setNeedClientAuth(requireClientAuth); engine.setWantClientAuth(wantClientAuth); - engine.setNeedClientAuth(requireClientAuth); } /**

10 years, 9 months

1
0
0 / 0

JBossWeb SVN: r2378 - branches/7.3.x/src/main/java/org/apache/coyote/http11.

by jbossweb-commits＠lists.jboss.org

Author: remy.maucherat(a)jboss.com Date: 2014-03-10 10:49:05 -0400 (Mon, 10 Mar 2014) New Revision: 2378 Modified: branches/7.3.x/src/main/java/org/apache/coyote/http11/AbstractInternalOutputBuffer.java branches/7.3.x/src/main/java/org/apache/coyote/http11/InternalAprOutputBuffer.java branches/7.3.x/src/main/java/org/apache/coyote/http11/InternalOutputBuffer.java Log: BZ1073159: Preload constant. Modified: branches/7.3.x/src/main/java/org/apache/coyote/http11/AbstractInternalOutputBuffer.java =================================================================== --- branches/7.3.x/src/main/java/org/apache/coyote/http11/AbstractInternalOutputBuffer.java 2014-03-10 14:48:49 UTC (rev 2377) +++ branches/7.3.x/src/main/java/org/apache/coyote/http11/AbstractInternalOutputBuffer.java 2014-03-10 14:49:05 UTC (rev 2378) @@ -140,6 +140,10 @@ // Cause loading of HttpMessages HttpMessages.getMessage(200); + + // Cause loading of constants + boolean res = org.apache.coyote.Constants.USE_CUSTOM_STATUS_MSG_IN_HEADER; + } /** Modified: branches/7.3.x/src/main/java/org/apache/coyote/http11/InternalAprOutputBuffer.java =================================================================== --- branches/7.3.x/src/main/java/org/apache/coyote/http11/InternalAprOutputBuffer.java 2014-03-10 14:48:49 UTC (rev 2377) +++ branches/7.3.x/src/main/java/org/apache/coyote/http11/InternalAprOutputBuffer.java 2014-03-10 14:49:05 UTC (rev 2378) @@ -80,6 +80,9 @@ // Cause loading of HttpMessages HttpMessages.getMessage(200); + // Cause loading of constants + boolean res = org.apache.coyote.Constants.USE_CUSTOM_STATUS_MSG_IN_HEADER; + } Modified: branches/7.3.x/src/main/java/org/apache/coyote/http11/InternalOutputBuffer.java =================================================================== --- branches/7.3.x/src/main/java/org/apache/coyote/http11/InternalOutputBuffer.java 2014-03-10 14:48:49 UTC (rev 2377) +++ branches/7.3.x/src/main/java/org/apache/coyote/http11/InternalOutputBuffer.java 2014-03-10 14:49:05 UTC (rev 2378) @@ -77,6 +77,9 @@ committed = false; finished = false; + // Cause loading of constants + boolean res = org.apache.coyote.Constants.USE_CUSTOM_STATUS_MSG_IN_HEADER; + }

10 years, 9 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 March 2014