March 2015 - jbossweb-commits - Jboss List Archives

JBossWeb SVN: r2602 - in branches/JBOSSWEB_2_1_12_GA_patch03_JBPAPP-11217: java/org/apache/jasper/compiler and 1 other directory.

by jbossweb-commits＠lists.jboss.org

Author: aogburn Date: 2015-03-26 16:22:47 -0400 (Thu, 26 Mar 2015) New Revision: 2602 Modified: branches/JBOSSWEB_2_1_12_GA_patch03_JBPAPP-11217/build.xml branches/JBOSSWEB_2_1_12_GA_patch03_JBPAPP-11217/java/org/apache/jasper/compiler/JspConfig.java Log: [JBPAPP-11217] merge fix Modified: branches/JBOSSWEB_2_1_12_GA_patch03_JBPAPP-11217/build.xml =================================================================== --- branches/JBOSSWEB_2_1_12_GA_patch03_JBPAPP-11217/build.xml 2015-03-26 19:39:50 UTC (rev 2601) +++ branches/JBOSSWEB_2_1_12_GA_patch03_JBPAPP-11217/build.xml 2015-03-26 20:22:47 UTC (rev 2602) @@ -843,7 +843,7 @@ <target name="build-jasper-jdt-src"> <jar destfile="${jasper-jdt-src.jar}" index="true"> - <fileset dir="${jasper-jdt-src.home}/src/plugins/org.eclipse.jdt.core/model"> + <fileset dir="${jasper-jdt-src.home}/plugins/org.eclipse.jdt.core/model"> <include name="org/eclipse/jdt/core/compiler/**"/> <include name="org/eclipse/jdt/internal/compiler/**"/> <include name="org/eclipse/jdt/internal/core/util/CommentRecorder*"/> Modified: branches/JBOSSWEB_2_1_12_GA_patch03_JBPAPP-11217/java/org/apache/jasper/compiler/JspConfig.java =================================================================== --- branches/JBOSSWEB_2_1_12_GA_patch03_JBPAPP-11217/java/org/apache/jasper/compiler/JspConfig.java 2015-03-26 19:39:50 UTC (rev 2601) +++ branches/JBOSSWEB_2_1_12_GA_patch03_JBPAPP-11217/java/org/apache/jasper/compiler/JspConfig.java 2015-03-26 20:22:47 UTC (rev 2602) @@ -215,13 +215,17 @@ private void init() throws JasperException { if (!initialized) { - processWebDotXml(ctxt); - defaultJspProperty = new JspProperty(defaultIsXml, - defaultIsELIgnored, - defaultIsScriptingInvalid, - null, null, null, defaultDeferedSyntaxAllowedAsLiteral, - defaultTrimDirectiveWhitespaces); - initialized = true; + synchronized (this) { + if (!initialized) { + processWebDotXml(ctxt); + defaultJspProperty = new JspProperty(defaultIsXml, + defaultIsELIgnored, + defaultIsScriptingInvalid, + null, null, null, defaultDeferedSyntaxAllowedAsLiteral, + defaultTrimDirectiveWhitespaces); + initialized = true; + } + } } } Property changes on: branches/JBOSSWEB_2_1_12_GA_patch03_JBPAPP-11217/java/org/apache/jasper/compiler/JspConfig.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/2.1.x/java/org/apache/jasper/compiler/JspConfig.java:2600

9 years, 9 months

1
0
0 / 0

JBossWeb SVN: r2601 - branches.

by jbossweb-commits＠lists.jboss.org

Author: aogburn Date: 2015-03-26 15:39:50 -0400 (Thu, 26 Mar 2015) New Revision: 2601 Added: branches/JBOSSWEB_2_1_12_GA_patch03_JBPAPP-11217/ Log: [JBPAPP-11217] create one off patch branch

9 years, 9 months

1
0
0 / 0

JBossWeb SVN: r2600 - branches/2.1.x/java/org/apache/jasper/compiler.

by jbossweb-commits＠lists.jboss.org

Author: aogburn Date: 2015-03-26 15:24:30 -0400 (Thu, 26 Mar 2015) New Revision: 2600 Modified: branches/2.1.x/java/org/apache/jasper/compiler/JspConfig.java Log: [JBWEB-311] make JspConfig.init thread safe Modified: branches/2.1.x/java/org/apache/jasper/compiler/JspConfig.java =================================================================== --- branches/2.1.x/java/org/apache/jasper/compiler/JspConfig.java 2015-03-18 16:25:19 UTC (rev 2599) +++ branches/2.1.x/java/org/apache/jasper/compiler/JspConfig.java 2015-03-26 19:24:30 UTC (rev 2600) @@ -215,13 +215,17 @@ private void init() throws JasperException { if (!initialized) { - processWebDotXml(ctxt); - defaultJspProperty = new JspProperty(defaultIsXml, - defaultIsELIgnored, - defaultIsScriptingInvalid, - null, null, null, defaultDeferedSyntaxAllowedAsLiteral, - defaultTrimDirectiveWhitespaces); - initialized = true; + synchronized (this) { + if (!initialized) { + processWebDotXml(ctxt); + defaultJspProperty = new JspProperty(defaultIsXml, + defaultIsELIgnored, + defaultIsScriptingInvalid, + null, null, null, defaultDeferedSyntaxAllowedAsLiteral, + defaultTrimDirectiveWhitespaces); + initialized = true; + } + } } }

9 years, 9 months

1
0
0 / 0

JBossWeb SVN: r2599 - branches/7.5.x/src/main/java/org/apache/coyote/http11.

by jbossweb-commits＠lists.jboss.org

Author: remy.maucherat(a)jboss.com Date: 2015-03-18 12:25:19 -0400 (Wed, 18 Mar 2015) New Revision: 2599 Modified: branches/7.5.x/src/main/java/org/apache/coyote/http11/Http11AprProcessor.java branches/7.5.x/src/main/java/org/apache/coyote/http11/Http11NioProcessor.java branches/7.5.x/src/main/java/org/apache/coyote/http11/Http11Processor.java Log: BZ1190298: Allow setting content-type in a 204 response, submitted by Enrique Gonzalez Martinez. Modified: branches/7.5.x/src/main/java/org/apache/coyote/http11/Http11AprProcessor.java =================================================================== --- branches/7.5.x/src/main/java/org/apache/coyote/http11/Http11AprProcessor.java 2015-03-13 13:53:54 UTC (rev 2598) +++ branches/7.5.x/src/main/java/org/apache/coyote/http11/Http11AprProcessor.java 2015-03-18 16:25:19 UTC (rev 2599) @@ -1710,7 +1710,9 @@ MimeHeaders headers = response.getMimeHeaders(); if (!entityBody) { response.setContentLength(-1); - } else { + } + // A SC_NO_CONTENT response may include entity headers + if (entityBody || response.getStatus() == 204){ String contentType = response.getContentType(); if (contentType != null) { headers.setValue("Content-Type").setString(contentType); Modified: branches/7.5.x/src/main/java/org/apache/coyote/http11/Http11NioProcessor.java =================================================================== --- branches/7.5.x/src/main/java/org/apache/coyote/http11/Http11NioProcessor.java 2015-03-13 13:53:54 UTC (rev 2598) +++ branches/7.5.x/src/main/java/org/apache/coyote/http11/Http11NioProcessor.java 2015-03-18 16:25:19 UTC (rev 2599) @@ -1189,7 +1189,9 @@ MimeHeaders headers = response.getMimeHeaders(); if (!entityBody) { response.setContentLength(-1); - } else { + } + // A SC_NO_CONTENT response may include entity headers + if (entityBody || response.getStatus() == 204){ String contentType = response.getContentType(); if (contentType != null) { headers.setValue("Content-Type").setString(contentType); Modified: branches/7.5.x/src/main/java/org/apache/coyote/http11/Http11Processor.java =================================================================== --- branches/7.5.x/src/main/java/org/apache/coyote/http11/Http11Processor.java 2015-03-13 13:53:54 UTC (rev 2598) +++ branches/7.5.x/src/main/java/org/apache/coyote/http11/Http11Processor.java 2015-03-18 16:25:19 UTC (rev 2599) @@ -1550,7 +1550,9 @@ MimeHeaders headers = response.getMimeHeaders(); if (!entityBody) { response.setContentLength(-1); - } else { + } + // A SC_NO_CONTENT response may include entity headers + if (entityBody || response.getStatus() == 204){ String contentType = response.getContentType(); if (contentType != null) { headers.setValue("Content-Type").setString(contentType);

9 years, 9 months

1
0
0 / 0

JBossWeb SVN: r2598 - 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-03-13 09:53:54 -0400 (Fri, 13 Mar 2015) New Revision: 2598 Modified: branches/7.5.x/src/main/java/org/apache/tomcat/util/net/AbstractEndpoint.java Log: BZ1200276: for now, disable "sendfile" (the only performance benefit with NIO2 is saving a thread), as fixing the code is a large change (in addition to being incorrect, the current code is also bad for SSL since without keepalive capabilities there is a large performance impact due to the reconnection). Modified: branches/7.5.x/src/main/java/org/apache/tomcat/util/net/AbstractEndpoint.java =================================================================== --- branches/7.5.x/src/main/java/org/apache/tomcat/util/net/AbstractEndpoint.java 2015-03-11 15:23:29 UTC (rev 2597) +++ branches/7.5.x/src/main/java/org/apache/tomcat/util/net/AbstractEndpoint.java 2015-03-13 13:53:54 UTC (rev 2598) @@ -179,7 +179,7 @@ /** * Use sendfile for sending static files. */ - protected boolean useSendfile = true; + protected boolean useSendfile = false; /** * Reverse connection. In this proxied mode, the endpoint will not use a

9 years, 9 months

1
0
0 / 0

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

by jbossweb-commits＠lists.jboss.org

Author: remy.maucherat(a)jboss.com Date: 2015-03-11 11:23:29 -0400 (Wed, 11 Mar 2015) New Revision: 2597 Modified: branches/7.5.x/src/main/java/org/apache/tomcat/util/net/jsse/SecureNioChannel.java Log: BZ1200276 (to be confirmed): port Tomcat code to handle incomplete writes and special cases. Modified: branches/7.5.x/src/main/java/org/apache/tomcat/util/net/jsse/SecureNioChannel.java =================================================================== --- branches/7.5.x/src/main/java/org/apache/tomcat/util/net/jsse/SecureNioChannel.java 2015-02-20 09:56:23 UTC (rev 2596) +++ branches/7.5.x/src/main/java/org/apache/tomcat/util/net/jsse/SecureNioChannel.java 2015-03-11 15:23:29 UTC (rev 2597) @@ -20,6 +20,7 @@ import static org.jboss.web.CoyoteMessages.MESSAGES; +import java.io.EOFException; import java.io.IOException; import java.nio.BufferOverflowException; import java.nio.ByteBuffer; @@ -321,7 +322,7 @@ * java.nio.channels.CompletionHandler) */ @Override - public <A> void write(final ByteBuffer src, long timeout, TimeUnit unit, final A attachment, + public <A> void write(final ByteBuffer src, final long timeout, final TimeUnit unit, final A attachment, final CompletionHandler<Integer, ? super A> handler) { // The handshake is completed @@ -340,13 +341,18 @@ @Override public void completed(Integer nBytes, A attach) { - if (nBytes < 0) { - handler.failed(new ClosedChannelException(), attach); - } else { - // Call the handler completed method with the - // consumed bytes number - handler.completed(written, attach); - } + if (nBytes.intValue() < 0) { + failed(new EOFException(), attach); + } else if (netOutBuffer.hasRemaining()) { + channel.write(netOutBuffer, timeout, unit, attachment, this); + } else if (written == 0) { + // Special case, start over to avoid code duplication + write(src, timeout, unit, attachment, handler); + } else { + // Call the handler completed method with the + // consumed bytes number + handler.completed(Integer.valueOf(written), attach); + } } @Override

9 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 2015