July 2013 - jbossweb-commits - Jboss List Archives

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

by jbossweb-commits＠lists.jboss.org

Author: remy.maucherat(a)jboss.com Date: 2013-07-22 09:33:36 -0400 (Mon, 22 Jul 2013) New Revision: 2238 Modified: branches/7.2.x/src/main/java/org/apache/tomcat/util/net/AprEndpoint.java branches/7.2.x/src/main/java/org/apache/tomcat/util/net/JIoEndpoint.java branches/7.2.x/src/main/java/org/apache/tomcat/util/net/NioEndpoint.java branches/7.2.x/src/main/java/org/jboss/web/CoyoteLogger.java Log: JBWEB-276: Move operations that use an executor to a separate category for possible filtering. Modified: branches/7.2.x/src/main/java/org/apache/tomcat/util/net/AprEndpoint.java =================================================================== --- branches/7.2.x/src/main/java/org/apache/tomcat/util/net/AprEndpoint.java 2013-07-12 07:18:47 UTC (rev 2237) +++ branches/7.2.x/src/main/java/org/apache/tomcat/util/net/AprEndpoint.java 2013-07-22 13:33:36 UTC (rev 2238) @@ -992,7 +992,7 @@ } catch (Throwable t) { // This means we got an OOM or similar creating a thread, or that // the pool and its queue are full - CoyoteLogger.UTIL_LOGGER.errorProcessingSocket(t); + CoyoteLogger.NET_LOGGER.errorProcessingSocket(t); return false; } return true; @@ -1017,7 +1017,7 @@ } catch (Throwable t) { // This means we got an OOM or similar creating a thread, or that // the pool and its queue are full - CoyoteLogger.UTIL_LOGGER.errorProcessingSocket(t); + CoyoteLogger.NET_LOGGER.errorProcessingSocket(t); return false; } return true; @@ -1042,7 +1042,7 @@ } catch (Throwable t) { // This means we got an OOM or similar creating a thread, or that // the pool and its queue are full - CoyoteLogger.UTIL_LOGGER.errorProcessingSocket(t); + CoyoteLogger.NET_LOGGER.errorProcessingSocket(t); return false; } return true; Modified: branches/7.2.x/src/main/java/org/apache/tomcat/util/net/JIoEndpoint.java =================================================================== --- branches/7.2.x/src/main/java/org/apache/tomcat/util/net/JIoEndpoint.java 2013-07-12 07:18:47 UTC (rev 2237) +++ branches/7.2.x/src/main/java/org/apache/tomcat/util/net/JIoEndpoint.java 2013-07-22 13:33:36 UTC (rev 2238) @@ -1220,7 +1220,7 @@ } catch (Throwable t) { // This means we got an OOM or similar creating a thread, or that // the pool and its queue are full - CoyoteLogger.UTIL_LOGGER.errorProcessingSocket(t); + CoyoteLogger.NET_LOGGER.errorProcessingSocket(t); return false; } return true; @@ -1245,7 +1245,7 @@ } catch (Throwable t) { // This means we got an OOM or similar creating a thread, or that // the pool and its queue are full - CoyoteLogger.UTIL_LOGGER.errorProcessingSocket(t); + CoyoteLogger.NET_LOGGER.errorProcessingSocket(t); return false; } return true; Modified: branches/7.2.x/src/main/java/org/apache/tomcat/util/net/NioEndpoint.java =================================================================== --- branches/7.2.x/src/main/java/org/apache/tomcat/util/net/NioEndpoint.java 2013-07-12 07:18:47 UTC (rev 2237) +++ branches/7.2.x/src/main/java/org/apache/tomcat/util/net/NioEndpoint.java 2013-07-22 13:33:36 UTC (rev 2238) @@ -462,7 +462,7 @@ } catch (Throwable t) { // This means we got an OOM or similar creating a thread, or that // the pool and its queue are full - CoyoteLogger.UTIL_LOGGER.errorProcessingSocket(t); + CoyoteLogger.NET_LOGGER.errorProcessingSocket(t); return false; } return true; @@ -487,7 +487,7 @@ } catch (Throwable t) { // This means we got an OOM or similar creating a thread, or that // the pool and its queue are full - CoyoteLogger.UTIL_LOGGER.errorProcessingSocket(t); + CoyoteLogger.NET_LOGGER.errorProcessingSocket(t); return false; } } @@ -504,7 +504,7 @@ } catch (Throwable t) { // This means we got an OOM or similar creating a thread, or that // the pool and its queue are full - CoyoteLogger.UTIL_LOGGER.errorProcessingSocket(t); + CoyoteLogger.NET_LOGGER.errorProcessingSocket(t); return false; } } Modified: branches/7.2.x/src/main/java/org/jboss/web/CoyoteLogger.java =================================================================== --- branches/7.2.x/src/main/java/org/jboss/web/CoyoteLogger.java 2013-07-12 07:18:47 UTC (rev 2237) +++ branches/7.2.x/src/main/java/org/jboss/web/CoyoteLogger.java 2013-07-22 13:33:36 UTC (rev 2238) @@ -53,6 +53,11 @@ /** * A logger with the category of the package name. */ + CoyoteLogger NET_LOGGER = Logger.getMessageLogger(CoyoteLogger.class, "org.apache.tomcat.util.net"); + + /** + * A logger with the category of the package name. + */ CoyoteLogger HTTP_LOGGER = Logger.getMessageLogger(CoyoteLogger.class, "org.apache.coyote.http11"); /**

11 years, 5 months

1
0
0 / 0

JBossWeb SVN: r2236 - branches/JBOSSWEB_7_0_16_FINAL_BZ-983108/java/org/apache/tomcat/util/http.

by jbossweb-commits＠lists.jboss.org

Author: tfonteyn Date: 2013-07-11 03:44:47 -0400 (Thu, 11 Jul 2013) New Revision: 2236 Modified: branches/JBOSSWEB_7_0_16_FINAL_BZ-983108/java/org/apache/tomcat/util/http/Parameters.java Log: [bz-983108] This is a copy of https://svn.jboss.org/repos/jbossweb/branches/JBOSSWEB_7_0_16_FINAL_BZ-97... with the additional bz-983108 fix Modified: branches/JBOSSWEB_7_0_16_FINAL_BZ-983108/java/org/apache/tomcat/util/http/Parameters.java =================================================================== --- branches/JBOSSWEB_7_0_16_FINAL_BZ-983108/java/org/apache/tomcat/util/http/Parameters.java 2013-07-10 14:17:58 UTC (rev 2235) +++ branches/JBOSSWEB_7_0_16_FINAL_BZ-983108/java/org/apache/tomcat/util/http/Parameters.java 2013-07-11 07:44:47 UTC (rev 2236) @@ -404,7 +404,8 @@ Integer.valueOf(decodeFailCount))); } if (parseFailed) { - throw new IllegalStateException(sm.getString("parameters.failed")); + //no need to throw an exception, let's just log a warning as previously done + log.warn(sm.getString("parameters.failed")); } }

11 years, 5 months

1
0
0 / 0

JBossWeb SVN: r2235 - branches.

by jbossweb-commits＠lists.jboss.org

Author: tfonteyn Date: 2013-07-10 10:17:58 -0400 (Wed, 10 Jul 2013) New Revision: 2235 Added: branches/JBOSSWEB_7_0_16_FINAL_BZ-983108/ Log: https://bugzilla.redhat.com/show_bug.cgi?id=983108 combo one-off patch for BZ 900775 (allow org.apache.tomcat.util.ENABLE_MODELER=true) WFLY-254 (tomcatAuthentication attribute on the AJP connector) JBPAPP6-941 (java.lang.IllegalStateException: Parameters processing failed)

11 years, 5 months

1
0
0 / 0

JBossWeb SVN: r2234 - tags.

by jbossweb-commits＠lists.jboss.org

Author: remy.maucherat(a)jboss.com Date: 2013-07-08 07:26:26 -0400 (Mon, 08 Jul 2013) New Revision: 2234 Added: tags/JBOSSWEB_7_2_1_FINAL/ Log: 7.2.1 build.

11 years, 5 months

1
0
0 / 0

JBossWeb SVN: r2233 - branches/7.2.x.

by jbossweb-commits＠lists.jboss.org

Author: remy.maucherat(a)jboss.com Date: 2013-07-08 07:20:32 -0400 (Mon, 08 Jul 2013) New Revision: 2233 Modified: branches/7.2.x/pom.xml Log: 7.2.1 build. Modified: branches/7.2.x/pom.xml =================================================================== (Binary files differ)

11 years, 5 months

1
0
0 / 0

JBossWeb SVN: r2232 - in branches: 7.2.x/src/main/java/org/apache/coyote and 2 other directories.

by jbossweb-commits＠lists.jboss.org

Author: remy.maucherat(a)jboss.com Date: 2013-07-05 12:33:00 -0400 (Fri, 05 Jul 2013) New Revision: 2232 Modified: branches/2.1.x/java/org/apache/coyote/Request.java branches/7.2.x/src/main/java/org/apache/coyote/Request.java branches/8.0.x/src/main/java/org/apache/coyote/Request.java branches/JBOSSWEB_2_0_0_GA_CP/src/share/classes/org/apache/coyote/Request.java Log: Fix IPvhosts by recycling localName (should be ok on 2.0 and 2.1 though). Modified: branches/2.1.x/java/org/apache/coyote/Request.java =================================================================== --- branches/2.1.x/java/org/apache/coyote/Request.java 2013-07-05 03:45:48 UTC (rev 2231) +++ branches/2.1.x/java/org/apache/coyote/Request.java 2013-07-05 16:33:00 UTC (rev 2232) @@ -491,6 +491,7 @@ headers.recycle(); serverNameMB.recycle(); serverPort=-1; + localNameMB.recycle(); localPort = -1; remotePort = -1; available = 0; Modified: branches/7.2.x/src/main/java/org/apache/coyote/Request.java =================================================================== --- branches/7.2.x/src/main/java/org/apache/coyote/Request.java 2013-07-05 03:45:48 UTC (rev 2231) +++ branches/7.2.x/src/main/java/org/apache/coyote/Request.java 2013-07-05 16:33:00 UTC (rev 2232) @@ -501,6 +501,7 @@ headers.recycle(); serverNameMB.recycle(); serverPort=-1; + localNameMB.recycle(); localPort = -1; remotePort = -1; available = 0; Modified: branches/8.0.x/src/main/java/org/apache/coyote/Request.java =================================================================== --- branches/8.0.x/src/main/java/org/apache/coyote/Request.java 2013-07-05 03:45:48 UTC (rev 2231) +++ branches/8.0.x/src/main/java/org/apache/coyote/Request.java 2013-07-05 16:33:00 UTC (rev 2232) @@ -501,6 +501,7 @@ headers.recycle(); serverNameMB.recycle(); serverPort=-1; + localNameMB.recycle(); localPort = -1; remotePort = -1; available = 0; Modified: branches/JBOSSWEB_2_0_0_GA_CP/src/share/classes/org/apache/coyote/Request.java =================================================================== --- branches/JBOSSWEB_2_0_0_GA_CP/src/share/classes/org/apache/coyote/Request.java 2013-07-05 03:45:48 UTC (rev 2231) +++ branches/JBOSSWEB_2_0_0_GA_CP/src/share/classes/org/apache/coyote/Request.java 2013-07-05 16:33:00 UTC (rev 2232) @@ -482,6 +482,7 @@ headers.recycle(); serverNameMB.recycle(); serverPort=-1; + localNameMB.recycle(); localPort = -1; remotePort = -1;

11 years, 5 months

1
0
0 / 0

JBossWeb SVN: r2231 - branches.

by jbossweb-commits＠lists.jboss.org

Author: aogburn Date: 2013-07-04 23:45:48 -0400 (Thu, 04 Jul 2013) New Revision: 2231 Added: branches/JBOSSWEB_7_0_17_FINAL_BZ-981516/ Removed: branches/JBOSSWEB_7_0_17_FINNAL_BZ-981516/ Log: [BZ-981516] correct branch name

11 years, 5 months

1
0
0 / 0

JBossWeb SVN: r2230 - branches/JBOSSWEB_7_0_17_FINNAL_BZ-981516/java/org/apache/coyote/http11.

by jbossweb-commits＠lists.jboss.org

Author: aogburn Date: 2013-07-04 23:44:45 -0400 (Thu, 04 Jul 2013) New Revision: 2230 Modified: branches/JBOSSWEB_7_0_17_FINNAL_BZ-981516/java/org/apache/coyote/http11/Http11Protocol.java Log: [BZ-981516] commit fix Modified: branches/JBOSSWEB_7_0_17_FINNAL_BZ-981516/java/org/apache/coyote/http11/Http11Protocol.java =================================================================== --- branches/JBOSSWEB_7_0_17_FINNAL_BZ-981516/java/org/apache/coyote/http11/Http11Protocol.java 2013-07-05 03:23:05 UTC (rev 2229) +++ branches/JBOSSWEB_7_0_17_FINNAL_BZ-981516/java/org/apache/coyote/http11/Http11Protocol.java 2013-07-05 03:44:45 UTC (rev 2230) @@ -72,7 +72,10 @@ protected static StringManager sm = StringManager.getManager(Constants.Package); + private static final Object syncInitLock = new Object(); + private boolean SYNC_INIT = Boolean.valueOf(System.getProperty("org.apache.coyote.http11.Http11Protocol.SYNC_INIT")).booleanValue(); + // ------------------------------------------------------------ Constructor @@ -157,43 +160,88 @@ } public void init() throws Exception { - endpoint.setName(getName()); - endpoint.setHandler(cHandler); + if(!SYNC_INIT) { + endpoint.setName(getName()); + endpoint.setHandler(cHandler); - // Verify the validity of the configured socket factory - try { - if (isSSLEnabled()) { - sslImplementation = - SSLImplementation.getInstance(sslImplementationName); - socketFactory = sslImplementation.getServerSocketFactory(); - endpoint.setServerSocketFactory(socketFactory); - } else if (socketFactoryName != null) { - socketFactory = (ServerSocketFactory) Class.forName(socketFactoryName).newInstance(); - endpoint.setServerSocketFactory(socketFactory); + // Verify the validity of the configured socket factory + try { + if (isSSLEnabled()) { + sslImplementation = + SSLImplementation.getInstance(sslImplementationName); + socketFactory = sslImplementation.getServerSocketFactory(); + endpoint.setServerSocketFactory(socketFactory); + } else if (socketFactoryName != null) { + socketFactory = (ServerSocketFactory) Class.forName(socketFactoryName).newInstance(); + endpoint.setServerSocketFactory(socketFactory); + } + } catch (Exception ex) { + log.error(sm.getString("http11protocol.socketfactory.initerror"), + ex); + throw ex; } - } catch (Exception ex) { - log.error(sm.getString("http11protocol.socketfactory.initerror"), - ex); - throw ex; - } - if (socketFactory!=null) { - Iterator<String> attE = attributes.keySet().iterator(); - while( attE.hasNext() ) { - String key = attE.next(); - Object v=attributes.get(key); - socketFactory.setAttribute(key, v); + if (socketFactory!=null) { + Iterator<String> attE = attributes.keySet().iterator(); + while( attE.hasNext() ) { + String key = attE.next(); + Object v=attributes.get(key); + socketFactory.setAttribute(key, v); + } } - } - try { - endpoint.init(); - } catch (Exception ex) { - log.error(sm.getString("http11protocol.endpoint.initerror"), ex); - throw ex; + try { + endpoint.init(); + } catch (Exception ex) { + log.error(sm.getString("http11protocol.endpoint.initerror"), ex); + throw ex; + } + if (log.isDebugEnabled()) + log.debug(sm.getString("http11protocol.init", getName())); + } else { + synchronized ( syncInitLock ){ + if (log.isTraceEnabled()) + log.trace("Doing sync http init"); + + endpoint.setName(getName()); + endpoint.setHandler(cHandler); + + // Verify the validity of the configured socket factory + try { + if (isSSLEnabled()) { + sslImplementation = + SSLImplementation.getInstance(sslImplementationName); + socketFactory = sslImplementation.getServerSocketFactory(); + endpoint.setServerSocketFactory(socketFactory); + } else if (socketFactoryName != null) { + socketFactory = (ServerSocketFactory) Class.forName(socketFactoryName).newInstance(); + endpoint.setServerSocketFactory(socketFactory); + } + } catch (Exception ex) { + log.error(sm.getString("http11protocol.socketfactory.initerror"), + ex); + throw ex; + } + + if (socketFactory!=null) { + Iterator<String> attE = attributes.keySet().iterator(); + while( attE.hasNext() ) { + String key = attE.next(); + Object v=attributes.get(key); + socketFactory.setAttribute(key, v); + } + } + + try { + endpoint.init(); + } catch (Exception ex) { + log.error(sm.getString("http11protocol.endpoint.initerror"), ex); + throw ex; + } + if (log.isDebugEnabled()) + log.debug(sm.getString("http11protocol.init", getName())); + } } - if (log.isDebugEnabled()) - log.debug(sm.getString("http11protocol.init", getName())); }

11 years, 5 months

1
0
0 / 0

JBossWeb SVN: r2229 - branches.

by jbossweb-commits＠lists.jboss.org

Author: aogburn Date: 2013-07-04 23:23:05 -0400 (Thu, 04 Jul 2013) New Revision: 2229 Added: branches/JBOSSWEB_7_0_17_FINNAL_BZ-981516/ Log: [BZ-981516] create one off patch branch

11 years, 5 months

1
0
0 / 0

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

by jbossweb-commits＠lists.jboss.org

Author: remy.maucherat(a)jboss.com Date: 2013-07-04 10:27:16 -0400 (Thu, 04 Jul 2013) New Revision: 2228 Modified: branches/8.0.x/src/main/java/org/apache/jasper/servlet/JspServlet.java branches/8.0.x/src/main/java/org/jboss/web/JasperMessages.java Log: Port JSP 2.3 restriction to GET, POST and HEAD. Modified: branches/8.0.x/src/main/java/org/apache/jasper/servlet/JspServlet.java =================================================================== --- branches/8.0.x/src/main/java/org/apache/jasper/servlet/JspServlet.java 2013-07-04 09:55:49 UTC (rev 2227) +++ branches/8.0.x/src/main/java/org/apache/jasper/servlet/JspServlet.java 2013-07-04 14:27:16 UTC (rev 2228) @@ -200,6 +200,18 @@ HttpServletResponse response) throws ServletException, IOException { + String method = request.getMethod(); + + if (!"GET".equals(method) && !"POST".equals(method) && + !"HEAD".equals(method)) { + // Specification states behaviour is undefined + // Jasper opts to reject any other verbs, partly as they are + // unlikely to make sense in a JSP context and partly to protect + // against verb tampering + response.sendError(HttpServletResponse.SC_METHOD_NOT_ALLOWED, + MESSAGES.forbiddenHttpMethod()); + } + String jspUri = null; String jspFile = (String) request.getAttribute(Constants.JSP_FILE); Modified: branches/8.0.x/src/main/java/org/jboss/web/JasperMessages.java =================================================================== --- branches/8.0.x/src/main/java/org/jboss/web/JasperMessages.java 2013-07-04 09:55:49 UTC (rev 2227) +++ branches/8.0.x/src/main/java/org/jboss/web/JasperMessages.java 2013-07-04 14:27:16 UTC (rev 2228) @@ -781,4 +781,7 @@ @Message(id = 4247, value = "Unexpected internal error during <import&gt: Target servlet called getOutputStream(), then getWriter()") IllegalStateException usedWriterAfterOutputStream(); + @Message(id = 4248, value = "JSPs only permit GET POST or HEAD") + String forbiddenHttpMethod(); + }

11 years, 5 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 July 2013