svn commit: r1785810 - /tomcat/tc7.0.x/trunk/test/org/apache/catalina/core/TestAsyncContextImpl.java
Author: markt Date: Tue Mar 7 08:24:59 2017 New Revision: 1785810 URL: http://svn.apache.org/viewvc?rev=1785810&view=rev Log: Fix failing test Modified: tomcat/tc7.0.x/trunk/test/org/apache/catalina/core/TestAsyncContextImpl.java Modified: tomcat/tc7.0.x/trunk/test/org/apache/catalina/core/TestAsyncContextImpl.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/catalina/core/TestAsyncContextImpl.java?rev=1785810&r1=1785809&r2=1785810&view=diff == --- tomcat/tc7.0.x/trunk/test/org/apache/catalina/core/TestAsyncContextImpl.java (original) +++ tomcat/tc7.0.x/trunk/test/org/apache/catalina/core/TestAsyncContextImpl.java Tue Mar 7 08:24:59 2017 @@ -2384,8 +2384,8 @@ public class TestAsyncContextImpl extend EasyMock.expect(context.getApplicationEventListeners()).andReturn(null); EasyMock.expect(context.getLoader()).andReturn(loader); EasyMock.expect(loader.getClassLoader()).andReturn(null); - EasyMock.expect(Boolean.valueOf(context.fireRequestDestroyEvent(request))).andReturn( -Boolean.TRUE); +EasyMock.expect(Boolean.valueOf( + context.fireRequestDestroyEvent(request.getRequest(.andReturn(Boolean.TRUE); EasyMock.replay(context, loader); - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
buildbot success in on tomcat-7-trunk
The Buildbot has detected a restored build on builder tomcat-7-trunk while building . Full details are available at: https://ci.apache.org/builders/tomcat-7-trunk/builds/687 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: silvanus_ubuntu Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-7-commit' triggered this build Build Source Stamp: [branch tomcat/tc7.0.x/trunk] 1785810 Blamelist: markt Build succeeded! Sincerely, -The Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[GUMP@vmgump-vm3]: Project tomcat-tc7.0.x-test-apr (in module tomcat-7.0.x) failed
To whom it may engage... This is an automated request, but not an unsolicited one. For more information please visit http://gump.apache.org/nagged.html, and/or contact the folk at gene...@gump.apache.org. Project tomcat-tc7.0.x-test-apr has an issue affecting its community integration. This issue affects 1 projects. The current state of this project is 'Failed', with reason 'Build Failed'. For reference only, the following projects are affected by this: - tomcat-tc7.0.x-test-apr : Tomcat 7.x, a web server implementing Java Servlet 3.0, ... Full details are available at: http://vmgump-vm3.apache.org/tomcat-7.0.x/tomcat-tc7.0.x-test-apr/index.html That said, some information snippets are provided here. The following annotations (debug/informational/warning/error messages) were provided: -DEBUG- Dependency on tomcat-tc7.0.x-dbcp exists, no need to add for property tomcat-dbcp-src.jar. -DEBUG- Dependency on commons-daemon exists, no need to add for property commons-daemon.native.src.tgz. -DEBUG- Dependency on commons-daemon exists, no need to add for property tomcat-native.tar.gz. -DEBUG- Dependency on tomcat-tc7.0.x-dbcp exists, no need to add for property tomcat-dbcp.home. -INFO- Failed with reason build failed -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-7.0.x/output/logs-APR -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-7.0.x/output/test-tmp-APR/logs The following work was performed: http://vmgump-vm3.apache.org/tomcat-7.0.x/tomcat-tc7.0.x-test-apr/gump_work/build_tomcat-7.0.x_tomcat-tc7.0.x-test-apr.html Work Name: build_tomcat-7.0.x_tomcat-tc7.0.x-test-apr (Type: Build) Work ended in a state of : Failed Elapsed: 20 mins 33 secs Command Line: /usr/lib/jvm/java-8-oracle/bin/java -Djava.awt.headless=true -Dbuild.sysclasspath=only org.apache.tools.ant.Main -Dgump.merge=/srv/gump/public/gump/work/merge.xml -Dbase.path=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-build-libs -Dcommons-pool.home=/srv/gump/public/workspace/commons-pool-1.x -Dtest.temp=output/test-tmp-APR -Djunit.jar=/srv/gump/public/workspace/junit/target/junit-4.13-SNAPSHOT.jar -Dobjenesis.jar=/srv/gump/public/workspace/objenesis/main/target/objenesis-2.6-SNAPSHOT.jar -Dexamples.sources.skip=true -Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20170307.jar -Dtomcat-dbcp-src.jar=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps/tomcat-dbcp-src.jar -Dtomcat-dbcp.home=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps -Dtest.excludePerformance=true -Dhamcrest.jar=/srv/gump/packages/hamcrest/hamcrest-core-1.3.jar -Dcommons-dbcp.home=/srv/gump/public/workspace/commons-dbcp-1.x -Dexecute.test.apr=true -Dexec ute.test.bio=false -Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20170307-native-src.tar.gz -Dtest.reports=output/logs-APR -Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20170307-native-src.tar.gz -Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.5-201506032000/ecj-4.5.jar -Dtest.apr.loc=/srv/gump/public/workspace/tomcat-native-12/dest-20170307/lib -Dtest.relaxTiming=true -Dexecute.test.nio=false -Dtest.accesslog=true -Dtomcat-dbcp.jar=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps/tomcat-dbcp-20170307.jar -Deasymock.jar=/srv/gump/public/workspace/easymock/core/target/easymock-3.5-SNAPSHOT.jar -Dcglib.jar=/srv/gump/packages/cglib/cglib-nodep-2.2.jar test [Working Directory: /srv/gump/public/workspace/tomcat-7.0.x] CLASSPATH: /usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-7.0.x/output/testclasses:/srv/gump/public/workspace/ant/dist/lib/ant.jar:/srv/gump/public/workspace/ant/dist/lib/ant-launcher.jar:/srv/gump/public/workspace/ant/dist/lib/ant-jmf.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit4.jar:/srv/gump/public/workspace/ant/dist/lib/ant-swing.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-resolver.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-xalan2.jar:/srv/gump/public/workspace/xml-commons/java/build/resolver.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/servlet-api.ja r:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/tomcat-coyote.jar:/srv/gump/public/
[GUMP@vmgump-vm3]: Project tomcat-tc7.0.x-test-nio (in module tomcat-7.0.x) failed
To whom it may engage... This is an automated request, but not an unsolicited one. For more information please visit http://gump.apache.org/nagged.html, and/or contact the folk at gene...@gump.apache.org. Project tomcat-tc7.0.x-test-nio has an issue affecting its community integration. This issue affects 1 projects. The current state of this project is 'Failed', with reason 'Build Failed'. For reference only, the following projects are affected by this: - tomcat-tc7.0.x-test-nio : Tomcat 7.x, a web server implementing Java Servlet 3.0, ... Full details are available at: http://vmgump-vm3.apache.org/tomcat-7.0.x/tomcat-tc7.0.x-test-nio/index.html That said, some information snippets are provided here. The following annotations (debug/informational/warning/error messages) were provided: -DEBUG- Dependency on tomcat-tc7.0.x-dbcp exists, no need to add for property tomcat-dbcp-src.jar. -DEBUG- Dependency on commons-daemon exists, no need to add for property commons-daemon.native.src.tgz. -DEBUG- Dependency on commons-daemon exists, no need to add for property tomcat-native.tar.gz. -DEBUG- Dependency on tomcat-tc7.0.x-dbcp exists, no need to add for property tomcat-dbcp.home. -INFO- Failed with reason build failed -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-7.0.x/output/logs-NIO -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-7.0.x/output/test-tmp-NIO/logs The following work was performed: http://vmgump-vm3.apache.org/tomcat-7.0.x/tomcat-tc7.0.x-test-nio/gump_work/build_tomcat-7.0.x_tomcat-tc7.0.x-test-nio.html Work Name: build_tomcat-7.0.x_tomcat-tc7.0.x-test-nio (Type: Build) Work ended in a state of : Failed Elapsed: 17 mins 39 secs Command Line: /usr/lib/jvm/java-8-oracle/bin/java -Djava.awt.headless=true -Dbuild.sysclasspath=only org.apache.tools.ant.Main -Dgump.merge=/srv/gump/public/gump/work/merge.xml -Dbase.path=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-build-libs -Dcommons-pool.home=/srv/gump/public/workspace/commons-pool-1.x -Dtest.temp=output/test-tmp-NIO -Djunit.jar=/srv/gump/public/workspace/junit/target/junit-4.13-SNAPSHOT.jar -Dobjenesis.jar=/srv/gump/public/workspace/objenesis/main/target/objenesis-2.6-SNAPSHOT.jar -Dexamples.sources.skip=true -Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20170307.jar -Dtomcat-dbcp-src.jar=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps/tomcat-dbcp-src.jar -Dtomcat-dbcp.home=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps -Dtest.excludePerformance=true -Dhamcrest.jar=/srv/gump/packages/hamcrest/hamcrest-core-1.3.jar -Dcommons-dbcp.home=/srv/gump/public/workspace/commons-dbcp-1.x -Dexecute.test.apr=false -Dexe cute.test.bio=false -Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20170307-native-src.tar.gz -Dtest.reports=output/logs-NIO -Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20170307-native-src.tar.gz -Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.5-201506032000/ecj-4.5.jar -Dtest.relaxTiming=true -Dexecute.test.nio=true -Dtest.accesslog=true -Dtomcat-dbcp.jar=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps/tomcat-dbcp-20170307.jar -Deasymock.jar=/srv/gump/public/workspace/easymock/core/target/easymock-3.5-SNAPSHOT.jar -Dcglib.jar=/srv/gump/packages/cglib/cglib-nodep-2.2.jar test [Working Directory: /srv/gump/public/workspace/tomcat-7.0.x] CLASSPATH: /usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-7.0.x/output/testclasses:/srv/gump/public/workspace/ant/dist/lib/ant.jar:/srv/gump/public/workspace/ant/dist/lib/ant-launcher.jar:/srv/gump/public/workspace/ant/dist/lib/ant-jmf.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit4.jar:/srv/gump/public/workspace/ant/dist/lib/ant-swing.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-resolver.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-xalan2.jar:/srv/gump/public/workspace/xml-commons/java/build/resolver.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/servlet-api.ja r:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/jasper.jar:/srv/gump/public/workspace
svn commit: r1785820 - in /tomcat/trunk/java/org/apache/coyote/http2: LocalStrings.properties Stream.java
Author: remm
Date: Tue Mar 7 10:24:38 2017
New Revision: 1785820
URL: http://svn.apache.org/viewvc?rev=1785820&view=rev
Log:
Unlock a blocking read (with an IOE) when a stream exception occurs. The likely
bad behavior is seen in many tests in the testsuite. Originally I think this is
supposed to wait for a reset frame, but I don't really see a benefit.
Modified:
tomcat/trunk/java/org/apache/coyote/http2/LocalStrings.properties
tomcat/trunk/java/org/apache/coyote/http2/Stream.java
Modified: tomcat/trunk/java/org/apache/coyote/http2/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http2/LocalStrings.properties?rev=1785820&r1=1785819&r2=1785820&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http2/LocalStrings.properties (original)
+++ tomcat/trunk/java/org/apache/coyote/http2/LocalStrings.properties Tue Mar
7 10:24:38 2017
@@ -85,6 +85,7 @@ stream.write=Connection [{0}], Stream [{
stream.inputBuffer.copy=Copying [{0}] bytes from inBuffer to outBuffer
stream.inputBuffer.dispatch=Data added to inBuffer when read interest is
registered. Triggering a read dispatch
stream.inputBuffer.empty=The Stream input buffer is empty. Waiting for more
data
+stream.inputBuffer.reset=Stream reset
stream.inputBuffer.signal=Data added to inBuffer when read thread is waiting.
Signalling that thread to continue
stream.outputBuffer.flush.debug=Connection [{0}], Stream [{1}], flushing
output with buffer at position [{2}], writeInProgress [{3}] and closed [{4}]
Modified: tomcat/trunk/java/org/apache/coyote/http2/Stream.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http2/Stream.java?rev=1785820&r1=1785819&r2=1785820&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http2/Stream.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http2/Stream.java Tue Mar 7 10:24:38
2017
@@ -470,6 +470,10 @@ class Stream extends AbstractStream impl
} else {
handler.closeConnection(http2Exception);
}
+// Reads wait internally so need to call a method to break the wait()
+if (inputBuffer != null) {
+inputBuffer.receiveReset();
+}
}
@@ -691,8 +695,7 @@ class Stream extends AbstractStream impl
}
inBuffer.wait();
if (reset) {
-// TODO: i18n
-throw new IOException("HTTP/2 Stream reset");
+throw new
IOException(sm.getString("stream.inputBuffer.reset"));
}
} catch (InterruptedException e) {
// Possible shutdown / rst or similar. Use an
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1785821 - /tomcat/trunk/webapps/docs/changelog.xml
Author: remm Date: Tue Mar 7 10:24:53 2017 New Revision: 1785821 URL: http://svn.apache.org/viewvc?rev=1785821&view=rev Log: Unlock a blocking read (with an IOE) when a stream exception occurs. The likely bad behavior is seen in many tests in the testsuite. Originally I think this is supposed to wait for a reset frame, but I don't really see a benefit. Modified: tomcat/trunk/webapps/docs/changelog.xml Modified: tomcat/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1785821&r1=1785820&r2=1785821&view=diff == --- tomcat/trunk/webapps/docs/changelog.xml (original) +++ tomcat/trunk/webapps/docs/changelog.xml Tue Mar 7 10:24:53 2017 @@ -232,6 +232,9 @@ NioEndpoint.stopLatch to make the class easier to extend. (markt) + +Blocking read unlock when a stream exception occurs with HTTP/2. (remm) + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1785823 - in /tomcat/trunk: java/org/apache/jasper/runtime/ test/org/apache/jasper/runtime/ test/webapp/bug5nnnn/ webapps/docs/
Author: markt
Date: Tue Mar 7 10:51:55 2017
New Revision: 1785823
URL: http://svn.apache.org/viewvc?rev=1785823&view=rev
Log:
Follow up to the fix for bug 58178. When creating the ELContext for a tag file,
ensure that any registered ELContextListeners are fired.
Added:
tomcat/trunk/test/webapp/bug5/bug58178c.jsp
Modified:
tomcat/trunk/java/org/apache/jasper/runtime/JspApplicationContextImpl.java
tomcat/trunk/java/org/apache/jasper/runtime/JspContextWrapper.java
tomcat/trunk/test/org/apache/jasper/runtime/TestJspContextWrapper.java
tomcat/trunk/webapps/docs/changelog.xml
Modified:
tomcat/trunk/java/org/apache/jasper/runtime/JspApplicationContextImpl.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/runtime/JspApplicationContextImpl.java?rev=1785823&r1=1785822&r2=1785823&view=diff
==
--- tomcat/trunk/java/org/apache/jasper/runtime/JspApplicationContextImpl.java
(original)
+++ tomcat/trunk/java/org/apache/jasper/runtime/JspApplicationContextImpl.java
Tue Mar 7 10:51:55 2017
@@ -22,6 +22,7 @@ import java.util.ArrayList;
import java.util.List;
import javax.el.CompositeELResolver;
+import javax.el.ELContext;
import javax.el.ELContextEvent;
import javax.el.ELContextListener;
import javax.el.ELResolver;
@@ -101,12 +102,16 @@ public class JspApplicationContextImpl i
ctx.putContext(JspContext.class, context);
// alert all ELContextListeners
-ELContextEvent event = new ELContextEvent(ctx);
+fireListeners(ctx);
+
+return ctx;
+}
+
+protected void fireListeners(ELContext elContext) {
+ELContextEvent event = new ELContextEvent(elContext);
for (int i = 0; i < this.contextListeners.size(); i++) {
this.contextListeners.get(i).contextCreated(event);
}
-
-return ctx;
}
private ELResolver createELResolver() {
Modified: tomcat/trunk/java/org/apache/jasper/runtime/JspContextWrapper.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/runtime/JspContextWrapper.java?rev=1785823&r1=1785822&r2=1785823&view=diff
==
--- tomcat/trunk/java/org/apache/jasper/runtime/JspContextWrapper.java
(original)
+++ tomcat/trunk/java/org/apache/jasper/runtime/JspContextWrapper.java Tue Mar
7 10:51:55 2017
@@ -41,7 +41,9 @@ import javax.servlet.ServletException;
import javax.servlet.ServletRequest;
import javax.servlet.ServletResponse;
import javax.servlet.http.HttpSession;
+import javax.servlet.jsp.JspApplicationContext;
import javax.servlet.jsp.JspContext;
+import javax.servlet.jsp.JspFactory;
import javax.servlet.jsp.JspWriter;
import javax.servlet.jsp.PageContext;
import javax.servlet.jsp.el.ELException;
@@ -508,6 +510,11 @@ public class JspContextWrapper extends P
public ELContext getELContext() {
if (elContext == null) {
elContext = new ELContextWrapper(rootJspCtxt.getELContext(),
jspTag, this);
+JspFactory factory = JspFactory.getDefaultFactory();
+JspApplicationContext jspAppCtxt =
factory.getJspApplicationContext(servletContext);
+if (jspAppCtxt instanceof JspApplicationContextImpl) {
+((JspApplicationContextImpl)
jspAppCtxt).fireListeners(elContext);
+}
}
return elContext;
}
Modified: tomcat/trunk/test/org/apache/jasper/runtime/TestJspContextWrapper.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/jasper/runtime/TestJspContextWrapper.java?rev=1785823&r1=1785822&r2=1785823&view=diff
==
--- tomcat/trunk/test/org/apache/jasper/runtime/TestJspContextWrapper.java
(original)
+++ tomcat/trunk/test/org/apache/jasper/runtime/TestJspContextWrapper.java Tue
Mar 7 10:51:55 2017
@@ -66,4 +66,20 @@ public class TestJspContextWrapper exten
// Class import
Assert.assertTrue(result, result.contains("02-" +
Collections.EMPTY_LIST.size()));
}
+
+@Test
+public void testELTagFileELContextListener() throws Exception {
+getTomcatInstanceTestWebapp(false, true);
+
+ByteChunk out = new ByteChunk();
+
+int rc = getUrl("http://localhost:"; + getPort() +
"/test/bug5/bug58178c.jsp", out, null);
+
+Assert.assertEquals(HttpServletResponse.SC_OK, rc);
+
+String result = out.toString();
+
+Assert.assertTrue(result, result.contains("JSP count: 1"));
+Assert.assertTrue(result, result.contains("Tag count: 1"));
+}
}
Added: tomcat/trunk/test/webapp/bug5/bug58178c.jsp
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/webapp/bug5/bug58178c.jsp?rev=1785823&view=auto
==
--- tomcat/trunk/test/webapp/bug5/bug58178c.jsp (added)
svn commit: r1785826 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/jasper/runtime/ test/org/apache/jasper/runtime/ test/webapp/bug5nnnn/ webapps/docs/
Author: markt Date: Tue Mar 7 10:53:59 2017 New Revision: 1785826 URL: http://svn.apache.org/viewvc?rev=1785826&view=rev Log: Follow up to the fix for bug 58178. When creating the ELContext for a tag file, ensure that any registered ELContextListeners are fired. Added: tomcat/tc8.5.x/trunk/test/webapp/bug5/bug58178c.jsp - copied unchanged from r1785823, tomcat/trunk/test/webapp/bug5/bug58178c.jsp Modified: tomcat/tc8.5.x/trunk/ (props changed) tomcat/tc8.5.x/trunk/java/org/apache/jasper/runtime/JspApplicationContextImpl.java tomcat/tc8.5.x/trunk/java/org/apache/jasper/runtime/JspContextWrapper.java tomcat/tc8.5.x/trunk/test/org/apache/jasper/runtime/TestJspContextWrapper.java tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc8.5.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Mar 7 10:53:59 2017 @@ -1 +1 @@ -/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737903,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,1741190,1741197,1741202,1741208,1741213,1741221,1741225,1741232,1741409,1741501 ,1741677,1741892,1741896,1741984,1742023,1742042,1742071,1742090,1742093,1742101,1742105,1742111,1742139,1742146,1742148,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742387,1742448,1742509-1742512,1742917,1742919,1742933,1742975-1742976,1742984,1742986,1743019,1743115,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743698,1743700-1743701,1744058,1744064-1744065,1744125,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745083,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,1745576,1745735,1745744,1746304,1746306-1746307,1746319,1746327,1746338,1746340-1746341,1746344,1746427,1746441,1746473,1746490,1746492,1746495-1746496,1746499-1746501,1746503-1746507,1746509,1746549,1746551,1746554,1746556,1746558,1746584,1746620,1746649,1746724,1746939,1746989,1747014,1747028,1747035,1747210,1747225,1747234,1747253,1747404,1747506,1747536,1747 924,1747980,1747993,1748001,1748253,1748452,1748547,1748629,1748676,1748715,1749287,1749296,1749328,1749373,1749465,1749506,1749508,1749665-1749666,1749763,1749865-1749866,1749898,1749978,1749980,1750011,1750015,1750056,1750480,1750617,1750634,1750692,1750697,1750700,1750703,1750707,1750714,1750718,1750723,1750774,1750899,1750975,1750995,1751061,1751097,1751173,1751438,1751447,1751463,1751702,1752212,1752737,1752745,1753078,1753080,1753358,1753363,1754111,1754140-1754141,1754281,1754310,1754445,1754467,1754494,1754496,1754528,1754532-1754533,1754613,1754714,1754874,1754941,1754944,1754950-1754951,1755005,1755007,1755009,1755132,1755180-1755181,1755185,1755190,1755204-1755206,1755208,1755214,1755224,1755227,1755230,1755629,1755646-1755647,1755650,1755653,1755675,1755680,1755683,1755693,1755717,1755731-1755737,1755812,1755828,1755884,1755890,1755918-1755919,1755942,1755958,1755960,1755970,1755993,1756013,1756019,1756039,1756056,1756083-1756114,1756175,1756288-1756289,1756408-1756410,1 756778,1756798,1756878,1756898,1756939,1757123-1757124,1757126,1757128,1757132-1757133,1757136,1757145,1757167-1757168,1757175,1757180,1757182,1757195,1757271,1757278,1757347,1757353-1757354,1757363,1757374,1757399,1757406,1757408,1757485,1757495,1757499,1757527,1757578,1757684,1757722,1757727,1757790,1757799,1757813,1757853,1757883,1757903,1757976,1757997,1758000,1758058,1758072-1758075,1758078-1758079,1758223,1758257,1758261,1758276,1758292,1758369,1758378-1758383,1758421,1758423,1758425-1758427,1758430,1758443,1758448,1758459,1758483,1758486-1758487,1758499,1758525,1758556,1758580,1758582,1758584,1758588,1758842,1759019,1759212,1759224,1759227,1759252,1759274,1759513-1759516,1759611,1759757,1759785-1759790,1760005,1760022,1760109-1760110,1760135,1760200-1760201,1760227,1760300,1760397,1760446,1760454,1760640,1760648,1761057,1761422,1761491,1761498,1761500-1761501,1761550,1761553,1761572,1761574,1761625-1761626,1761628,1761682,1761740,1761752,1762051-1762053,1762123,1762168,176217 2,1762182,1762201-17
svn commit: r1785827 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/jasper/runtime/ test/org/apache/jasper/runtime/ test/webapp/bug5nnnn/ webapps/docs/
Author: markt Date: Tue Mar 7 10:56:10 2017 New Revision: 1785827 URL: http://svn.apache.org/viewvc?rev=1785827&view=rev Log: Follow up to the fix for bug 58178. When creating the ELContext for a tag file, ensure that any registered ELContextListeners are fired. Added: tomcat/tc8.0.x/trunk/test/webapp/bug5/bug58178c.jsp - copied unchanged from r1785823, tomcat/trunk/test/webapp/bug5/bug58178c.jsp Modified: tomcat/tc8.0.x/trunk/ (props changed) tomcat/tc8.0.x/trunk/java/org/apache/jasper/runtime/JspApplicationContextImpl.java tomcat/tc8.0.x/trunk/java/org/apache/jasper/runtime/JspContextWrapper.java tomcat/tc8.0.x/trunk/test/org/apache/jasper/runtime/TestJspContextWrapper.java tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc8.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Mar 7 10:56:10 2017 @@ -1,2 +1,2 @@ /tomcat/tc8.5.x/trunk:1735042,1737966,1743139-1743140,1744151,1747537,1747925,1748002,1754614,1754643,1762124,1762183,1762203,1763792,1772948,1777014,1779719,1782037,1782240,1782386-1782387,1785669 -/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1637890,1637892,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886 ,1644890,1644892,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1649973,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655351,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657 592,1657607,1657609,1657682,1657907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659174,1659184,1659188-1659189,1659216,1659263,1659293,1659304,1659306-1659307,1659382,1659384,1659428,1659471,1659486,1659505,1659516,1659521,1659524,1659559,1659562,1659803,1659806,1659814,1659833,1659862,1659905,1659919,1659948,1659967,1659983-1659984,1660060,1660074,1660077,1660133,1660168,1660331-1660332,1660353,1660358,1660924,1661386,1661770,1661867,1661972,1661990,1662200,1662308-1662309,1662548,1662614,1662696,1662736,1662985,1662988-1662989,1663264,1663277,1663298,1663534,1663562,1663676,1663715,1663754,1663768,1663772,1663781,1663893,1663995,1664143,1664163,1664174,1664301,1664317,1664347,1664657,1664659,1664710,1664863-1664864,1664866,1665085,1665292,1665559,1665653,1665661,1665672,1665694,1665697,1665736,1665779,1665976-1665977,1665980-1665981,1665985-1665986,1665989,1665998,1666004,1666008,1666013,1666017,1666024,1666116,1666386-1 666387,1666494,1666496,1666552,1666569,1666579,137,149,1666757,1666966,1666972,1666985,1666995,1666997,1667292,1667402,1667406,1667546,1667615,1667630,1667636,1667688,1667764,1667871,1668026,1668135,1668193,1668593,1668596,1668630,1668639,1668843,1669353,1669370,1669451,1669800,1669838,1669876,1669882,1670394,1670433,1670591,1670598-1670600,1670610,1670631,1670719,1670724,1670726,1670730,1670940,1671112,1672272,1672284,1673754,1674294,1675461,1675486,1675594,1675830,1676231,1676250-1676251,1676364,1676381,1676393,1676479,1676525,1676552,1676615,1676630,1676634,1676721,1676926,1676943,1677140,1677802,1678011,1678162,1678174,1678339,1678426-1678427,1678694,1678701,1679534,1679708,1679710,1679716,1680034,1680246,1681056,1681123,1681138,1681280,1681283,1681286,1681450,1681697,1681699,1681701,1681729,1
[Bug 58178] Exception not passed to c:catch in custom jsp tag
https://bz.apache.org/bugzilla/show_bug.cgi?id=58178 --- Comment #7 from Mark Thomas --- See also http://tomcat.markmail.org/thread/cnqkckysilwhpyip for a discussion on a follow-up issue and r1785823, r1785826 and r1785827 -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
buildbot failure in on tomcat-8-trunk
The Buildbot has detected a new failure on builder tomcat-8-trunk while building . Full details are available at: https://ci.apache.org/builders/tomcat-8-trunk/builds/943 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: silvanus_ubuntu Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-8-commit' triggered this build Build Source Stamp: [branch tomcat/tc8.0.x/trunk] 1785827 Blamelist: markt BUILD FAILED: failed compile_1 Sincerely, -The Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1785820 - in /tomcat/trunk/java/org/apache/coyote/http2: LocalStrings.properties Stream.java
2017-03-07 11:24 GMT+01:00 :
> Author: remm
> Date: Tue Mar 7 10:24:38 2017
> New Revision: 1785820
>
> URL: http://svn.apache.org/viewvc?rev=1785820&view=rev
> Log:
> Unlock a blocking read (with an IOE) when a stream exception occurs. The
> likely bad behavior is seen in many tests in the testsuite. Originally I
> think this is supposed to wait for a reset frame, but I don't really see a
> benefit.
>
Mark, are you ok with that ? It's really heavy handed ...
For whatever reason, it's not fixing the issue in CI:
https://ci.apache.org/projects/tomcat/tomcat9/logs/1785823/TEST-org.apache.coyote.http2.TestHttp2Section_6_9.NIO.txt
Supposed to be replaced with an IOE:
[junit] java.io.IOException: Stream reset
[junit] at
org.apache.coyote.http2.Stream$StreamInputBuffer.doRead(Stream.java:698)
[junit] at org.apache.coyote.Request.doRead(Request.java:511)
Rémy
>
> Modified:
> tomcat/trunk/java/org/apache/coyote/http2/LocalStrings.properties
> tomcat/trunk/java/org/apache/coyote/http2/Stream.java
>
> Modified: tomcat/trunk/java/org/apache/coyote/http2/LocalStrings.
> properties
> URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/
> coyote/http2/LocalStrings.properties?rev=1785820&r1=
> 1785819&r2=1785820&view=diff
>
> ==
> --- tomcat/trunk/java/org/apache/coyote/http2/LocalStrings.properties
> (original)
> +++ tomcat/trunk/java/org/apache/coyote/http2/LocalStrings.properties Tue
> Mar 7 10:24:38 2017
> @@ -85,6 +85,7 @@ stream.write=Connection [{0}], Stream [{
> stream.inputBuffer.copy=Copying [{0}] bytes from inBuffer to outBuffer
> stream.inputBuffer.dispatch=Data added to inBuffer when read interest is
> registered. Triggering a read dispatch
> stream.inputBuffer.empty=The Stream input buffer is empty. Waiting for
> more data
> +stream.inputBuffer.reset=Stream reset
> stream.inputBuffer.signal=Data added to inBuffer when read thread is
> waiting. Signalling that thread to continue
>
> stream.outputBuffer.flush.debug=Connection [{0}], Stream [{1}], flushing
> output with buffer at position [{2}], writeInProgress [{3}] and closed [{4}]
>
> Modified: tomcat/trunk/java/org/apache/coyote/http2/Stream.java
> URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/
> coyote/http2/Stream.java?rev=1785820&r1=1785819&r2=1785820&view=diff
>
> ==
> --- tomcat/trunk/java/org/apache/coyote/http2/Stream.java (original)
> +++ tomcat/trunk/java/org/apache/coyote/http2/Stream.java Tue Mar 7
> 10:24:38 2017
> @@ -470,6 +470,10 @@ class Stream extends AbstractStream impl
> } else {
> handler.closeConnection(http2Exception);
> }
> +// Reads wait internally so need to call a method to break the
> wait()
> +if (inputBuffer != null) {
> +inputBuffer.receiveReset();
> +}
> }
>
>
> @@ -691,8 +695,7 @@ class Stream extends AbstractStream impl
> }
> inBuffer.wait();
> if (reset) {
> -// TODO: i18n
> -throw new IOException("HTTP/2 Stream reset");
> +throw new IOException(sm.getString("
> stream.inputBuffer.reset"));
> }
> } catch (InterruptedException e) {
> // Possible shutdown / rst or similar. Use an
>
>
>
> -
> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> For additional commands, e-mail: dev-h...@tomcat.apache.org
>
>
svn commit: r1785832 - in /tomcat/trunk: java/org/apache/coyote/http2/Stream.java webapps/docs/changelog.xml
Author: remm
Date: Tue Mar 7 12:13:42 2017
New Revision: 1785832
URL: http://svn.apache.org/viewvc?rev=1785832&view=rev
Log:
Revert patch: the fix doesn't work if running more than one test (tested with
http2.TestHttp2Section_6_9).
Modified:
tomcat/trunk/java/org/apache/coyote/http2/Stream.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/coyote/http2/Stream.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http2/Stream.java?rev=1785832&r1=1785831&r2=1785832&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http2/Stream.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http2/Stream.java Tue Mar 7 12:13:42
2017
@@ -470,10 +470,6 @@ class Stream extends AbstractStream impl
} else {
handler.closeConnection(http2Exception);
}
-// Reads wait internally so need to call a method to break the wait()
-if (inputBuffer != null) {
-inputBuffer.receiveReset();
-}
}
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1785832&r1=1785831&r2=1785832&view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Tue Mar 7 12:13:42 2017
@@ -232,9 +232,6 @@
NioEndpoint.stopLatch to make the class easier to extend.
(markt)
-
-Blocking read unlock when a stream exception occurs with HTTP/2. (remm)
-
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 60828] New: After update - injected objects are not being initialized
https://bz.apache.org/bugzilla/show_bug.cgi?id=60828 Bug ID: 60828 Summary: After update - injected objects are not being initialized Product: Tomcat 7 Version: 7.0.75 Hardware: PC Status: NEW Severity: normal Priority: P2 Component: Catalina Assignee: dev@tomcat.apache.org Reporter: andra.ro...@ymail.com Target Milestone: --- 0 down vote favorite I updated form Tomcat 7.0.40 to Tomcat 7.0.75 and my application crashes with null pointer exception because the injected objects are not being initialized. The objects are declared as @Named and @ApplicationScoped. They also contains a @PostConstruct init() method - not called either. This behavior only occurs with the new Tomcat. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 60828] After update - injected objects are not being initialized
https://bz.apache.org/bugzilla/show_bug.cgi?id=60828 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |INVALID OS||All --- Comment #1 from Mark Thomas --- Neither @Named nor @ApplicationScoped are annotations that Tomcat recognises. You'll need to contact the support channel for whatever component provides them. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1785820 - in /tomcat/trunk/java/org/apache/coyote/http2: LocalStrings.properties Stream.java
On 07/03/17 11:48, Rémy Maucherat wrote:
> 2017-03-07 11:24 GMT+01:00 :
>
>> Author: remm
>> Date: Tue Mar 7 10:24:38 2017
>> New Revision: 1785820
>>
>> URL: http://svn.apache.org/viewvc?rev=1785820&view=rev
>> Log:
>> Unlock a blocking read (with an IOE) when a stream exception occurs. The
>> likely bad behavior is seen in many tests in the testsuite. Originally I
>> think this is supposed to wait for a reset frame, but I don't really see a
>> benefit.
>>
>
> Mark, are you ok with that ? It's really heavy handed ...
If it had worked, I would have been OK with it until we could come up
with a better plan.
Mark
> For whatever reason, it's not fixing the issue in CI:
> https://ci.apache.org/projects/tomcat/tomcat9/logs/1785823/TEST-org.apache.coyote.http2.TestHttp2Section_6_9.NIO.txt
>
> Supposed to be replaced with an IOE:
> [junit] java.io.IOException: Stream reset
> [junit] at
> org.apache.coyote.http2.Stream$StreamInputBuffer.doRead(Stream.java:698)
> [junit] at org.apache.coyote.Request.doRead(Request.java:511)
>
> Rémy
>
>>
>> Modified:
>> tomcat/trunk/java/org/apache/coyote/http2/LocalStrings.properties
>> tomcat/trunk/java/org/apache/coyote/http2/Stream.java
>>
>> Modified: tomcat/trunk/java/org/apache/coyote/http2/LocalStrings.
>> properties
>> URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/
>> coyote/http2/LocalStrings.properties?rev=1785820&r1=
>> 1785819&r2=1785820&view=diff
>>
>> ==
>> --- tomcat/trunk/java/org/apache/coyote/http2/LocalStrings.properties
>> (original)
>> +++ tomcat/trunk/java/org/apache/coyote/http2/LocalStrings.properties Tue
>> Mar 7 10:24:38 2017
>> @@ -85,6 +85,7 @@ stream.write=Connection [{0}], Stream [{
>> stream.inputBuffer.copy=Copying [{0}] bytes from inBuffer to outBuffer
>> stream.inputBuffer.dispatch=Data added to inBuffer when read interest is
>> registered. Triggering a read dispatch
>> stream.inputBuffer.empty=The Stream input buffer is empty. Waiting for
>> more data
>> +stream.inputBuffer.reset=Stream reset
>> stream.inputBuffer.signal=Data added to inBuffer when read thread is
>> waiting. Signalling that thread to continue
>>
>> stream.outputBuffer.flush.debug=Connection [{0}], Stream [{1}], flushing
>> output with buffer at position [{2}], writeInProgress [{3}] and closed [{4}]
>>
>> Modified: tomcat/trunk/java/org/apache/coyote/http2/Stream.java
>> URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/
>> coyote/http2/Stream.java?rev=1785820&r1=1785819&r2=1785820&view=diff
>>
>> ==
>> --- tomcat/trunk/java/org/apache/coyote/http2/Stream.java (original)
>> +++ tomcat/trunk/java/org/apache/coyote/http2/Stream.java Tue Mar 7
>> 10:24:38 2017
>> @@ -470,6 +470,10 @@ class Stream extends AbstractStream impl
>> } else {
>> handler.closeConnection(http2Exception);
>> }
>> +// Reads wait internally so need to call a method to break the
>> wait()
>> +if (inputBuffer != null) {
>> +inputBuffer.receiveReset();
>> +}
>> }
>>
>>
>> @@ -691,8 +695,7 @@ class Stream extends AbstractStream impl
>> }
>> inBuffer.wait();
>> if (reset) {
>> -// TODO: i18n
>> -throw new IOException("HTTP/2 Stream reset");
>> +throw new IOException(sm.getString("
>> stream.inputBuffer.reset"));
>> }
>> } catch (InterruptedException e) {
>> // Possible shutdown / rst or similar. Use an
>>
>>
>>
>> -
>> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
>> For additional commands, e-mail: dev-h...@tomcat.apache.org
>>
>>
>
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 57665] support x-forwarded-host
https://bz.apache.org/bugzilla/show_bug.cgi?id=57665 --- Comment #6 from Christopher Schultz --- (In reply to Balasubramanian from comment #5) > In which version of tomcat, this fix is available? I did not see this fix in > tomcat 9 and 8. What led you to believe that this enhancement request and patch had been applied to /any/ version of Tomcat? -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 57665] support x-forwarded-host
https://bz.apache.org/bugzilla/show_bug.cgi?id=57665 --- Comment #7 from Christopher Schultz --- I'm curious why this enhancement has even been requested. My understanding of the HTTP spec is that the "Host" header should not be modified by an intervening reverse-proxy. https://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.23 If you request http://example.com/application/path, then the client RFC-MUST supply "Host: example.com" in the headers and any reverse-proxy RFC-MUST forward that "Host: example.com" header on to the origin server. What reverse-proxy are you using which changes the "Host" header? -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 60750] A response that uses Transfer-Encoding: chunked is missing the last zero-length chunk
https://bz.apache.org/bugzilla/show_bug.cgi?id=60750 --- Comment #13 from Christopher Schultz --- (In reply to Ty from comment #12) > - there is no OOME in stdout or stderr I seem to recall some try/catch code in certain places in Tomcat that swallowed exceptions that I thought ought to at least be logged. It's possible that this particular edge-case hits those catches. OOMEs can happen for a number of reasons -- not always complete heap-exhaustion. So you might not be able to tell an OOME occurred if it didn't get logged to stderr and you were just watching e.g. total JVM memory usage. I'd be interested to see if JMX reports an increase in the OOME count when these zero-length chunks are dropped from the responses. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 57665] support x-forwarded-host
https://bz.apache.org/bugzilla/show_bug.cgi?id=57665 --- Comment #8 from Mike Youngstrom --- We modify the Host header mostly to work around limitations in application platforms our apps are hosted on. For example, Cloud Foundry only recently added support for path based routing and even still it only supports different paths for applications hosted in the same "space". If I have 2 applications that with different paths but need the same host then with Cloud Foundry modifying the Host header via configuration in an upstream load balancer is often the only option available to many of us. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 57665] support x-forwarded-host
https://bz.apache.org/bugzilla/show_bug.cgi?id=57665 --- Comment #9 from Stefan Fussenegger --- There are other scenarios than "an intervening reverse-proxy". One example would be a CDN that use the Host header of the backend and adds the original value as X-Forwarded-Host. (e.g. "Host: origin.example.com" and "X-Fowarded-Host: cdn.example.com"). Some applications running on "origin.example.com" will then use the Host header to create absolute links and redirects to "origin.example.com" which isn't wanted. The easiest workaround is to hide the real value of the "Host" header and use "X-Forwarded-Host" instead - which is what this patch is doing. see http://stackoverflow.com/questions/19084340/real-life-usage-of-the-x-forwarded-host-header for more examples -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 57665] support x-forwarded-host
https://bz.apache.org/bugzilla/show_bug.cgi?id=57665 Christopher Schultz changed: What|Removed |Added Attachment #33985|0 |1 is patch|| -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 57665] support x-forwarded-host
https://bz.apache.org/bugzilla/show_bug.cgi?id=57665 --- Comment #10 from Christopher Schultz --- Okay. I have no particular objection to this patch.. I just wanted to understand the use-cases a little more. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 60750] A response that uses Transfer-Encoding: chunked is missing the last zero-length chunk
https://bz.apache.org/bugzilla/show_bug.cgi?id=60750 --- Comment #14 from Ty --- > OOMEs can happen for a number of reasons -- not always complete > heap-exhaustion. Very true, I forgot about the "initialize an object array of size=Integer.MAX_VALUE" operations that OOME before they even begin. > I'd be interested to see if JMX reports an increase in the OOME count when > these > zero-length chunks are dropped from the responses. Once the heap size was increased, I see a very sharp and short-lived (i.e. garbage-collectable) increase in OldGen utilization. From memory, a spike of about 850MB. I think that's what you're asking about. Besides the probably-swallowed OOME, that just leaves the mystery of a response that (when under memory constraints) is missing the last chunk but otherwise is complete. I'd wager a third-party library is to blame -- in our case and in OP's case, there is a JSON library in the mix-- but what is strange to me is the response isn't compliant with the RFC spec for Transfer-Encoding: chunked, at least according to my reading of it: a response can't be considered complete without the zero byte chunk, but the server seems to think it is. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1785893 - /tomcat/trunk/test/org/apache/tomcat/websocket/server/TestAsyncMessages.java
Author: markt
Date: Tue Mar 7 21:56:10 2017
New Revision: 1785893
URL: http://svn.apache.org/viewvc?rev=1785893&view=rev
Log:
Add test case to explore issue reported on users list.
Added:
tomcat/trunk/test/org/apache/tomcat/websocket/server/TestAsyncMessages.java
Added:
tomcat/trunk/test/org/apache/tomcat/websocket/server/TestAsyncMessages.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/websocket/server/TestAsyncMessages.java?rev=1785893&view=auto
==
--- tomcat/trunk/test/org/apache/tomcat/websocket/server/TestAsyncMessages.java
(added)
+++ tomcat/trunk/test/org/apache/tomcat/websocket/server/TestAsyncMessages.java
Tue Mar 7 21:56:10 2017
@@ -0,0 +1,137 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.tomcat.websocket.server;
+
+import java.net.URI;
+import java.nio.ByteBuffer;
+import java.util.concurrent.CountDownLatch;
+
+import javax.websocket.ClientEndpointConfig;
+import javax.websocket.ContainerProvider;
+import javax.websocket.MessageHandler;
+import javax.websocket.Session;
+import javax.websocket.WebSocketContainer;
+
+import org.junit.Assert;
+import org.junit.Ignore;
+import org.junit.Test;
+
+import org.apache.catalina.Context;
+import org.apache.catalina.servlets.DefaultServlet;
+import org.apache.catalina.startup.Tomcat;
+import org.apache.catalina.startup.TomcatBaseTest;
+import org.apache.tomcat.websocket.TesterAsyncTiming;
+import
org.apache.tomcat.websocket.TesterMessageCountClient.TesterProgrammaticEndpoint;
+
+@Ignore // Test passes but GC delays can introduce false failures.
+public class TestAsyncMessages extends TomcatBaseTest {
+
+@Test
+public void testAsyncTiming() throws Exception {
+
+Tomcat tomcat = getTomcatInstance();
+// No file system docBase required
+Context ctx = tomcat.addContext("", null);
+ctx.addApplicationListener(TesterAsyncTiming.Config.class.getName());
+Tomcat.addServlet(ctx, "default", new DefaultServlet());
+ctx.addServletMappingDecoded("/", "default");
+
+tomcat.start();
+
+WebSocketContainer wsContainer =
ContainerProvider.getWebSocketContainer();
+ClientEndpointConfig clientEndpointConfig =
ClientEndpointConfig.Builder.create().build();
+Session wsSession = wsContainer.connectToServer(
+TesterProgrammaticEndpoint.class,
+clientEndpointConfig,
+new URI("ws://localhost:" + getPort() +
TesterAsyncTiming.Config.PATH));
+
+AsyncTimingClientHandler handler = new AsyncTimingClientHandler();
+wsSession.addMessageHandler(ByteBuffer.class, handler);
+wsSession.getBasicRemote().sendText("Hello");
+
+System.out.println("Sent Hello message, waiting for data");
+handler.waitForLatch();
+Assert.assertFalse(handler.hasFailed());
+}
+
+private static class AsyncTimingClientHandler implements
MessageHandler.Partial {
+
+private long lastMessage = 0;
+private int sequence = 0;
+private int count = 0;
+private CountDownLatch latch = new CountDownLatch(1);
+private volatile boolean fail = false;
+
+@Override
+public void onMessage(ByteBuffer message, boolean last) {
+if (lastMessage == 0) {
+// First message. Don't check
+sequence ++;
+lastMessage = System.nanoTime();
+} else {
+long newTime = System.nanoTime();
+long diff = newTime - lastMessage;
+lastMessage = newTime;
+
+if (sequence == 0) {
+sequence ++;
+if (message.capacity() != 8192) {
+System.out.println("Expected size 8192 but was [" +
message.capacity() + "], count [" + count + "]");
+fail = true;
+}
+if (diff < 4000) {
+System.out.println("Expected diff > 40ms but was [" +
diff + "], count [" + count + "]");
+fail = true;
+}
+} e
svn commit: r1785895 - /tomcat/trunk/test/org/apache/tomcat/websocket/TesterAsyncTiming.java
Author: markt
Date: Tue Mar 7 21:59:21 2017
New Revision: 1785895
URL: http://svn.apache.org/viewvc?rev=1785895&view=rev
Log:
Add supporting class
Added:
tomcat/trunk/test/org/apache/tomcat/websocket/TesterAsyncTiming.java
Added: tomcat/trunk/test/org/apache/tomcat/websocket/TesterAsyncTiming.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/websocket/TesterAsyncTiming.java?rev=1785895&view=auto
==
--- tomcat/trunk/test/org/apache/tomcat/websocket/TesterAsyncTiming.java (added)
+++ tomcat/trunk/test/org/apache/tomcat/websocket/TesterAsyncTiming.java Tue
Mar 7 21:59:21 2017
@@ -0,0 +1,87 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.tomcat.websocket;
+
+import java.nio.ByteBuffer;
+import java.util.concurrent.Semaphore;
+
+import javax.websocket.OnMessage;
+import javax.websocket.RemoteEndpoint.Async;
+import javax.websocket.SendHandler;
+import javax.websocket.SendResult;
+import javax.websocket.Session;
+import javax.websocket.server.ServerEndpoint;
+
+import org.apache.tomcat.websocket.server.TesterEndpointConfig;
+
+public class TesterAsyncTiming {
+
+public static class Config extends TesterEndpointConfig {
+
+public static final String PATH = "/timing";
+public static final int ITERATIONS = 500;
+public static final int SLEEP_MILLI = 50;
+
+@Override
+protected Class getEndpointClass() {
+return Endpoint.class;
+}
+}
+
+@ServerEndpoint(Config.PATH)
+public static class Endpoint {
+
+private static final ByteBuffer LARGE_DATA= ByteBuffer.allocate(16 *
1024);
+private static final ByteBuffer SMALL_DATA= ByteBuffer.allocate(4 *
1024);
+
+@OnMessage
+public void onMessage(Session session, @SuppressWarnings("unused")
String text) {
+
+Semaphore semaphore = new Semaphore(1);
+SendHandler handler = new SemaphoreSendHandler(semaphore);
+
+Async remote = session.getAsyncRemote();
+for (int i = 0; i < Config.ITERATIONS; i++) {
+try {
+semaphore.acquire(1);
+remote.sendBinary(LARGE_DATA, handler);
+semaphore.acquire(1);
+remote.sendBinary(SMALL_DATA, handler);
+Thread.sleep(Config.SLEEP_MILLI);
+LARGE_DATA.flip();
+SMALL_DATA.flip();
+} catch (InterruptedException e) {
+throw new IllegalStateException(e);
+}
+}
+}
+
+private class SemaphoreSendHandler implements SendHandler {
+
+private final Semaphore semaphore;
+
+private SemaphoreSendHandler(Semaphore semaphore) {
+this.semaphore = semaphore;
+}
+
+@Override
+public void onResult(SendResult result) {
+semaphore.release();
+}
+}
+}
+}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Implications of stopping a connector
-BEGIN PGP SIGNED MESSAGE- Hash: SHA256 All, If I stop a Connector (e.g. using JMX), I know that the listen port will be unbound and new connections will fail. But what about in-process requests? My testing shows that with a simple JSP like this: <% Thread.sleep(10 * 1000); %>This is a test. Stopping the connector during the 10-second interval causes an immediate disconnect. Pausing the connector allows in-process requests to complete, but then won't process any new requests (or even perform a TLS handshake). Resuming the connector will process the backlog. Is there a particular reason why the stop() operation must terminate in-process connections? Is it because (for HTTPS) the SSL engine must be destroyed? - -chris -BEGIN PGP SIGNATURE- Comment: GPGTools - http://gpgtools.org Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQIcBAEBCAAGBQJYvzoXAAoJEBzwKT+lPKRYySIP/0zfk1bTv2USpFuuc0LjYAaz O/RBy9qlZpOqArngDO1cP/AWsa9iMQ2348pgQStmhk2yhuCKHUaqvbOaUEyJBQ8L RkPWWY1rZ1Q77LnNW2IjeBrJP1YfNgwH23IxHWUImGPtqK+uk5l7qEK64eSZYtq/ ARFIgmPfBBo9UMi6kEq3oIy1nhfmcbJBYoXO3HGJ6nF6or1t5Dgq6bKKAyeOn1Ra STxUvjiqiHe2DrbJm7l0EGc2+yZt18TPINejdOt8XvjF/AsnMPFZrfYSoHjcHyFL +qYrYETko97W4k3EtzEjN1xThX/jA/m1ZAvZwE23Iaz/uZE+gQdpHeQ//eWmTN7s 4xCsnhmnYibMzXVkxo6ZG+o9CSLmmhgPyvGGxaoDozAOy90yDHNZRYQ6foIMgDJ/ k6XPMKAJIIR2tiQDWY2Jqmsub3alP9ZH776qzonFZ0j6ZSc//CwubzlVNnbwzHNQ t5XpH/TUykX5qhpA0GsPIjqHQ2wHrA/m2aI4RuDao4w/ZihcAteoJ8JNE5u+dn3n wo2t15foYrQ16M2gCjMmU0OTGix0NomUnGr3p2ko9ksCqbNQus1YGtBua5tplew+ 0eXBwYHpwci5F+2+p8VQesh4SUvjyrqxqAlHEO3HO4V5dBC1qzfjcQ5WS8KcRDe9 7gcQNZLQPcijJbku+JK5 =b4VO -END PGP SIGNATURE- - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 57830] Add support for ProxyProtocol
https://bz.apache.org/bugzilla/show_bug.cgi?id=57830 --- Comment #16 from Axel U --- Is there an update on adding PROXY protocol support? -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
