svn commit: r1707663 - in /tomcat/tc7.0.x/tags/TOMCAT_7_0_65: ./ build.properties.default
Author: violetagg Date: Fri Oct 9 06:28:38 2015 New Revision: 1707663 URL: http://svn.apache.org/viewvc?rev=1707663&view=rev Log: Tag 7.0.65 Added: tomcat/tc7.0.x/tags/TOMCAT_7_0_65/ (props changed) - copied from r1707661, tomcat/tc7.0.x/trunk/ Modified: tomcat/tc7.0.x/tags/TOMCAT_7_0_65/build.properties.default Propchange: tomcat/tc7.0.x/tags/TOMCAT_7_0_65/ -- bugtraq:append = false Propchange: tomcat/tc7.0.x/tags/TOMCAT_7_0_65/ -- bugtraq:label = Bugzilla ID (optional) Propchange: tomcat/tc7.0.x/tags/TOMCAT_7_0_65/ -- --- bugtraq:logregex (added) +++ bugtraq:logregex Fri Oct 9 06:28:38 2015 @@ -0,0 +1,2 @@ +(https?\://(bz|issues)\.apache\.org/bugzilla/show_bug.cgi\?id=\d+|BZ\s?\d+) +(\d+) Propchange: tomcat/tc7.0.x/tags/TOMCAT_7_0_65/ -- bugtraq:message = Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: tomcat/tc7.0.x/tags/TOMCAT_7_0_65/ -- bugtraq:url = https://bz.apache.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: tomcat/tc7.0.x/tags/TOMCAT_7_0_65/ -- --- svn:ignore (added) +++ svn:ignore Fri Oct 9 06:28:38 2015 @@ -0,0 +1,7 @@ +.* +build.properties +logs +nbproject +output +work +*.iml Propchange: tomcat/tc7.0.x/tags/TOMCAT_7_0_65/ -- --- svn:mergeinfo (added) +++ svn:mergeinfo Fri Oct 9 06:28:38 2015 @@ -0,0 +1,2 @@ +/tomcat/tc8.0.x/trunk:1636525,1637336,1637685,1637709,1638726,1640089,1640276,1640349,1640363,1640366,1640642,1640672,1640674,1640689,1640884,1641001,1641065,1641067,1641375,1641638,1641723,1641726,1641729-1641730,1641736,1641988,1642669-1642670,1642698,1642701,1643205,1643215,1643217,1643230,1643232,1643273,1643285,1643329-1643330,1643511,1643513,1643521,1643539,1643571,1643581-1643582,1643635,1643655,1643738,1643964,1644018,1644333,1644954,1644992,1645014,1645360,1645456,1645627,1645642,1645686,1645903-1645904,1645908-1645909,1645913,1645920,1646458,1646460-1646462,1646735,1646738-1646741,1646744,1646746,1646748-1646755,1646757,1646759-1646760,1647043,1648816,1651420-1651422,1651844,1652926,1652939-1652940,1652973,1653798,1653817,1653841,1654042,1654161,1654736,1654767,1654787,1656592,1659907,1662986,1663265,1663278,1663325,1663535,1663567,1663679,1663997,1664175,1664321,1664872,1665061,1665086,1666027,1666395,1666503,1666506,1666560,1666570,1666581,1666759,1666967,1666988,1667553 -1667555,1667558,1667617,1667633,1667637,1667747,1667767,1667873,1668028,1668137,1668634,1669432,1669801,1669840,1669895-1669896,1670398,1670435,1670592,1670605-1670607,1670609,1670632,1670720,1670725,1670727,1670731,1671114,1672273,1672285,1673759,1674220,1674295,1675469,1675488,1675595,1675831,1676232,1676367-1676369,1676382,1676394,1676483,1676556,1676635,1678178,1679536,1679988,1680256,1681124,1681182,1681730,1681840,1681864,1681869,1682010,1682034,1682047,1682052-1682053,1682062,1682064,1682070,1682312,1682325,1682331,1682386,1684367,1684385,1685759,1685774,1685827,1685892,1687341,1688904,1689358,1689657,1692850,1693093,1693108,1693324,1694060,1694115,1694291,1694427,1694431,1694503,1694549,1694789,1694873,1694881,1695356,1695372,1695823-1695825,1696200,1696281,1696379,1696468,1700608,1700871,1700897,1700978,1701094,1701124,1701608,1701668,1701676,1701766,1701944,1702248,1702252,1702314,1702390,1702723,1702725,1702728,1702730,1702733,1702735,1702737,1702739,1702742,1702744,1702 748,1702751,1702754,1702758,1702760,1702763,1702766,1703949,1704253,1704291,1704321-1704322,1704325,1704486,1704574,1704687,1707053 +/tomcat/trunk:1156115-1157160,1157162-1157859,1157862-1157942,1157945-1160347,1160349-1163716,1163718-1166689,1166691-1174340,1174342-1175596,1175598-1175611,1175613-1175932,1175934-1177783,1177785-1177980,1178006-1180720,1180722-1183094,1183096-1187753,1187755,1187775,1187801,1187806,1187809,1187826-1188312,1188314-1188401,1188646-1188840,1188842-1190176,1190178-1195223,1195225-1195953,1195955,1195957-1201238,1201240-1203345,1203347-1206623,1206625-1208046,1208073,1208096,1208114,1208145,1208772,1209194-1212125,1212127-1220291,1220293,1220295-1221321,1221323-1222329,1222332-1222401,1222405-1222795,1222850-1222950,1222969-1225326,1225328-1225463,1225465,1225627,1225629-1226534,1226536-1228908,1228911-1228923,1228927-1229532,1229534-1230766,1230768-1231625,1231627-1233414,1233419-1235207,1235209-1237425,1237427,1237429-1237977,1237981,1237985,1237995,1238070,1238073,1239024-1239048,1239050-1239062,1239135,1239256,1239258-1239485,1239785-1240046,1240101,1240106,1240109,1240112,1240114 ,1240116,1240118,124
Re: [VOTE] Release Apache Tomcat 8.0.28
Hi, 2015-10-07 22:13 GMT+03:00 Mark Thomas : > > The proposed Apache Tomcat 8.0.28 release is now available for voting. > > The main changes since 8.0.27 are: > > - Allow file based configuration resources (e.g. key stores) to be > configured using URLs > > - Restore code signing to the Windows installer an uninstaller > > There is a smaller that usual collection of bug fixes, new features and > performance improvements. For full details, see the changelog: > http://svn.us.apache.org/repos/asf/tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml > > It can be obtained from: > https://dist.apache.org/repos/dist/dev/tomcat/tomcat-8/v8.0.28/ > The Maven staging repo is: > https://repository.apache.org/content/repositories/orgapachetomcat-1052/ > The svn tag is: > http://svn.apache.org/repos/asf/tomcat/tc8.0.x/tags/TOMCAT_8_0_28/ > > The proposed 8.0.28 release is: > [ ] Broken - do not release > [X] Stable - go ahead and release as 8.0.28 Checked with applications that use the new specifications features - successful. Tested Tomcat in OSGi environment - successful. Regards, Violeta > - > 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 >
[GUMP@vmgump]: Project tomcat-tc8.0.x-test-bio (in module tomcat-8.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-tc8.0.x-test-bio has an issue affecting its community integration. This issue affects 1 projects, and has been outstanding for 7 runs. The current state of this project is 'Failed', with reason 'Build Failed'. For reference only, the following projects are affected by this: - tomcat-tc8.0.x-test-bio : Tomcat 8.x, a web server implementing the Java Servlet 3.1, ... Full details are available at: http://vmgump.apache.org/gump/public/tomcat-8.0.x/tomcat-tc8.0.x-test-bio/index.html That said, some information snippets are provided here. The following annotations (debug/informational/warning/error messages) were provided: -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. -INFO- Failed with reason build failed -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-8.0.x/output/logs-BIO -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-8.0.x/output/test-tmp-BIO/logs -WARNING- No directory [/srv/gump/public/workspace/tomcat-8.0.x/output/test-tmp-BIO/logs] The following work was performed: http://vmgump.apache.org/gump/public/tomcat-8.0.x/tomcat-tc8.0.x-test-bio/gump_work/build_tomcat-8.0.x_tomcat-tc8.0.x-test-bio.html Work Name: build_tomcat-8.0.x_tomcat-tc8.0.x-test-bio (Type: Build) Work ended in a state of : Failed Elapsed: 33 mins 15 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 -Djunit.jar=/srv/gump/public/workspace/junit/target/junit-4.13-SNAPSHOT.jar -Dobjenesis.jar=/srv/gump/public/workspace/objenesis/main/target/objenesis-2.3-SNAPSHOT.jar -Dtest.reports=output/logs-BIO -Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20151009-native-src.tar.gz -Dexamples.sources.skip=true -Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.5-201506032000/ecj-4.5.jar -Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20151009.jar -Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20151009-native-src.tar.gz -Dtest.temp=output/test-tmp-BIO -Dtest.accesslog=true -Dexecute.test.nio=false -Dtest.openssl.path=/srv/gump/public/workspace/openssl-1.0.2/dest-20151009/bin/o penssl -Dexecute.test.bio=true -Dexecute.test.apr=false -Dtest.excludePerformance=true -Dexecute.test.nio2=false -Deasymock.jar=/srv/gump/public/workspace/easymock/core/target/easymock-3.5-SNAPSHOT.jar -Dhamcrest.jar=/srv/gump/packages/hamcrest/hamcrest-core-1.3.jar -Dcglib.jar=/srv/gump/packages/cglib/cglib-nodep-2.2.jar test [Working Directory: /srv/gump/public/workspace/tomcat-8.0.x] CLASSPATH: /usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-8.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-8.0.x/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/servlet-api.ja r:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/websocket-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina-storeconfig.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/jasper.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/jasper-el.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina-tribes.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina-ha.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/tomcat-api.jar:/srv/gump/public/workspace/t
buildbot failure in ASF Buildbot on tomcat-trunk
The Buildbot has detected a new failure on builder tomcat-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-trunk/builds/407 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: silvanus_ubuntu Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-commit' triggered this build Build Source Stamp: [branch tomcat/trunk] 1707624 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
svn commit: r1707624 - /tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java
Author: markt
Date: Thu Oct 8 21:56:54 2015
New Revision: 1707624
URL: http://svn.apache.org/viewvc?rev=1707624&view=rev
Log:
Simplify
Modified:
tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java
Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java?rev=1707624&r1=1707623&r2=1707624&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java Thu Oct 8
21:56:54 2015
@@ -110,13 +110,6 @@ public class Http11Processor extends Abs
/**
- * Flag that indicates that send file processing is in progress and that
the
- * socket should not be returned to the poller (where a poller is used).
- */
-protected boolean sendfileInProgress = false;
-
-
-/**
* Flag that indicates if the request headers have been completely read.
*/
protected boolean readComplete = true;
@@ -938,7 +931,6 @@ public class Http11Processor extends Abs
// Flags
keepAlive = true;
openSocket = false;
-sendfileInProgress = false;
readComplete = true;
boolean keptAlive = false;
@@ -1139,7 +1131,7 @@ public class Http11Processor extends Abs
} else if (isUpgrade()) {
return SocketState.UPGRADING;
} else {
-if (sendfileInProgress) {
+if (sendfileData != null) {
return SocketState.SENDFILE;
} else {
if (openSocket) {
@@ -1775,9 +1767,9 @@ public class Http11Processor extends Abs
switch (socketWrapper.processSendfile(sendfileData)) {
case DONE:
// If sendfile is complete, no need to break keep-alive loop
+sendfileData = null;
return false;
case PENDING:
-sendfileInProgress = true;
return true;
case ERROR:
// Write failed
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1707623 - /tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java
Author: markt
Date: Thu Oct 8 21:46:42 2015
New Revision: 1707623
URL: http://svn.apache.org/viewvc?rev=1707623&view=rev
Log:
Simplify. Removes incorrect comment.
Modified:
tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java
Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java?rev=1707623&r1=1707622&r2=1707623&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java Thu Oct 8
21:46:42 2015
@@ -110,17 +110,6 @@ public class Http11Processor extends Abs
/**
- * Flag used to indicate that the socket should treat the next request
- * processed like a keep-alive connection - i.e. one where there may not be
- * any data to process. The initial value of this flag on entering the
- * process method is different for connectors that use polling (NIO / APR -
- * data is always expected) compared to those that use blocking (BIO - data
- * is only expected if the connection isn't in the keep-alive state).
- */
-protected boolean keptAlive;
-
-
-/**
* Flag that indicates that send file processing is in progress and that
the
* socket should not be returned to the poller (where a poller is used).
*/
@@ -951,7 +940,7 @@ public class Http11Processor extends Abs
openSocket = false;
sendfileInProgress = false;
readComplete = true;
-keptAlive = false;
+boolean keptAlive = false;
while (!getErrorState().isError() && keepAlive && !isAsync() &&
httpUpgradeHandler == null && !endpoint.isPaused()) {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
buildbot success in ASF Buildbot on tomcat-trunk
The Buildbot has detected a restored build on builder tomcat-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-trunk/builds/405 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: silvanus_ubuntu Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-commit' triggered this build Build Source Stamp: [branch tomcat/trunk] 1707622 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
buildbot failure in ASF Buildbot on tomcat-trunk
The Buildbot has detected a new failure on builder tomcat-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-trunk/builds/404 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: silvanus_ubuntu Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-commit' triggered this build Build Source Stamp: [branch tomcat/trunk] 1707619 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
svn commit: r1707622 - in /tomcat/trunk/java/org/apache/coyote: AbstractProcessor.java ajp/AjpProcessor.java ajp/LocalStrings.properties http11/Http11Processor.java http2/StreamProcessor.java
Author: markt
Date: Thu Oct 8 21:26:24 2015
New Revision: 1707622
URL: http://svn.apache.org/viewvc?rev=1707622&view=rev
Log:
Pull up sslSupport to the AbstractProcessor.
This removes the check for this being set for AJP but that check never detected
a bug
Modified:
tomcat/trunk/java/org/apache/coyote/AbstractProcessor.java
tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java
tomcat/trunk/java/org/apache/coyote/ajp/LocalStrings.properties
tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java
tomcat/trunk/java/org/apache/coyote/http2/StreamProcessor.java
Modified: tomcat/trunk/java/org/apache/coyote/AbstractProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/AbstractProcessor.java?rev=1707622&r1=1707621&r2=1707622&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/AbstractProcessor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/AbstractProcessor.java Thu Oct 8
21:26:24 2015
@@ -26,6 +26,7 @@ import org.apache.juli.logging.Log;
import org.apache.tomcat.util.ExceptionUtils;
import org.apache.tomcat.util.net.AbstractEndpoint;
import org.apache.tomcat.util.net.AbstractEndpoint.Handler.SocketState;
+import org.apache.tomcat.util.net.SSLSupport;
import org.apache.tomcat.util.net.SocketStatus;
import org.apache.tomcat.util.net.SocketWrapperBase;
import org.apache.tomcat.util.res.StringManager;
@@ -44,6 +45,7 @@ public abstract class AbstractProcessor
protected final Request request;
protected final Response response;
protected volatile SocketWrapperBase socketWrapper = null;
+protected volatile SSLSupport sslSupport;
private String clientCertProvider = null;
/**
@@ -168,6 +170,15 @@ public abstract class AbstractProcessor
/**
+ * Set the SSL information for this HTTP connection.
+ */
+@Override
+public final void setSslSupport(SSLSupport sslSupport) {
+this.sslSupport = sslSupport;
+}
+
+
+/**
* Obtain the Executor used by the underlying endpoint.
*/
@Override
@@ -248,6 +259,14 @@ public abstract class AbstractProcessor
/**
+ * Perform any necessary processing for a non-blocking read before
+ * dispatching to the adapter.
+ */
+protected void dispatchNonBlockingRead() {
+asyncStateMachine.asyncOperation();
+}
+
+/**
* Flush any pending writes. Used during non-blocking writes to flush any
* remaining data from a previous incomplete write.
*
@@ -260,14 +279,6 @@ public abstract class AbstractProcessor
protected abstract boolean flushBufferedWrite() throws IOException ;
/**
- * Perform any necessary processing for a non-blocking read before
- * dispatching to the adapter.
- */
-protected void dispatchNonBlockingRead() {
-asyncStateMachine.asyncOperation();
-}
-
-/**
* Perform any necessary clean-up processing if the dispatch resulted in
the
* completion of processing for the current request.
*
Modified: tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java?rev=1707622&r1=1707621&r2=1707622&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java Thu Oct 8
21:26:24 2015
@@ -790,16 +790,6 @@ public class AjpProcessor extends Abstra
@Override
-public void setSslSupport(SSLSupport sslSupport) {
-if (sslSupport != null) {
-// Should never reach this code but in case we do...
-throw new IllegalStateException(
-sm.getString("ajpprocessor.ssl.notsupported"));
-}
-}
-
-
-@Override
public HttpUpgradeHandler getHttpUpgradeHandler() {
// Should never reach this code but in case we do...
throw new IllegalStateException(
Modified: tomcat/trunk/java/org/apache/coyote/ajp/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ajp/LocalStrings.properties?rev=1707622&r1=1707621&r2=1707622&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/ajp/LocalStrings.properties (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/LocalStrings.properties Thu Oct 8
21:26:24 2015
@@ -26,7 +26,6 @@ ajpprocessor.readtimeout=Timeout attempt
ajpprocessor.request.prepare=Error preparing request
ajpprocessor.request.process=Error processing request
ajpprocessor.certs.fail=Certificate conversion failed
-ajpprocessor.ssl.notsupported=The SSL protocol is not supported by this
connector
ajpprocessor.httpupgrade.notsupported=HTTP upgrade is not supported by the AJP
protocol
ajpmessage.null=Cann
[GUMP@vmgump]: 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.apache.org/gump/public/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.apache.org/gump/public/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: 28 mins 49 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 -Djunit.jar=/srv/gump/public/workspace/junit/target/junit-4.13-SNAPSHOT.jar -Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20151008-native-src.tar.gz -Dtest.reports=output/logs-APR -Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20151008-native-src.tar.gz -Dexamples.sources.skip=true -Dtomcat-dbcp.home=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps -Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.5-201506032000/ecj-4.5.jar -Dtest.apr.loc=/srv/gump/public/workspace/tomcat-native/dest-20151008/lib -Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20151008.jar -Dtomcat-dbcp-src.jar=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps/tomcat-dbcp-src.jar -Dtest.exclu dePerformance=true -Dtest.accesslog=true -Dcommons-pool.home=/srv/gump/public/workspace/commons-pool-1.x -Dcommons-dbcp.home=/srv/gump/public/workspace/commons-dbcp-1.x -Dexecute.test.apr=true -Dexecute.test.bio=false -Dexecute.test.nio=false -Dtomcat-dbcp.jar=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps/tomcat-dbcp-20151008.jar -Dtest.temp=output/test-tmp-APR -Dhamcrest.jar=/srv/gump/packages/hamcrest/hamcrest-core-1.3.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/tomcat-7.0.x/output/build/lib/jasper-el.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/catalina-tribes.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/catalina-ha.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/buil
svn commit: r1707621 - in /tomcat/trunk/java/org/apache/coyote: AbstractProcessor.java Processor.java
Author: markt
Date: Thu Oct 8 21:15:20 2015
New Revision: 1707621
URL: http://svn.apache.org/viewvc?rev=1707621&view=rev
Log:
No point in having abstract methods in an abstract class that are defined in an
implemented interface.
Modified:
tomcat/trunk/java/org/apache/coyote/AbstractProcessor.java
tomcat/trunk/java/org/apache/coyote/Processor.java
Modified: tomcat/trunk/java/org/apache/coyote/AbstractProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/AbstractProcessor.java?rev=1707621&r1=1707620&r2=1707621&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/AbstractProcessor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/AbstractProcessor.java Thu Oct 8
21:15:20 2015
@@ -21,7 +21,6 @@ import java.io.InterruptedIOException;
import java.util.concurrent.Executor;
import javax.servlet.RequestDispatcher;
-import javax.servlet.http.HttpUpgradeHandler;
import org.apache.juli.logging.Log;
import org.apache.tomcat.util.ExceptionUtils;
@@ -193,16 +192,6 @@ public abstract class AbstractProcessor
getAdapter().errorDispatch(request, response);
}
-@Override
-public abstract boolean isUpgrade();
-
-/**
- * Process HTTP requests. All requests are treated as HTTP requests to
start
- * with although they may change type during processing.
- */
-@Override
-public abstract SocketState process(SocketWrapperBase socket) throws
IOException;
-
/**
* Process an in-progress request that is not longer in standard HTTP mode.
@@ -287,8 +276,5 @@ public abstract class AbstractProcessor
*/
protected abstract SocketState dispatchEndRequest();
-@Override
-public abstract HttpUpgradeHandler getHttpUpgradeHandler();
-
protected abstract Log getLog();
}
Modified: tomcat/trunk/java/org/apache/coyote/Processor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/Processor.java?rev=1707621&r1=1707620&r2=1707621&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/Processor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/Processor.java Thu Oct 8 21:15:20 2015
@@ -34,6 +34,18 @@ import org.apache.tomcat.util.net.Socket
public interface Processor {
Executor getExecutor();
+/**
+ * Process HTTP requests. All requests are treated as HTTP requests to
start
+ * with although they may change type during processing.
+ *
+ * @param socketWrapper The connection to process
+ *
+ * @return The state the caller should put the socket in when this method
+ * returns
+ *
+ * @throws IOException If an I/O error occurs during the processing of the
+ * request
+ */
SocketState process(SocketWrapperBase socketWrapper) throws IOException;
SocketState dispatch(SocketStatus status);
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1707619 - /tomcat/trunk/webapps/docs/config/systemprops.xml
Author: markt Date: Thu Oct 8 21:01:53 2015 New Revision: 1707619 URL: http://svn.apache.org/viewvc?rev=1707619&view=rev Log: Typos Modified: tomcat/trunk/webapps/docs/config/systemprops.xml Modified: tomcat/trunk/webapps/docs/config/systemprops.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/systemprops.xml?rev=1707619&r1=1707618&r2=1707619&view=diff == --- tomcat/trunk/webapps/docs/config/systemprops.xml (original) +++ tomcat/trunk/webapps/docs/config/systemprops.xml Thu Oct 8 21:01:53 2015 @@ -485,7 +485,7 @@ value for pluggabilitySkip and tldSkip attributes of the standard JarScanFilter implementation. - The coded default empty, however the system property is set in + The coded default is empty, however the system property is set in a default Tomcat installation via the $CATALINA_BASE/conf/catalina.properties file. @@ -495,7 +495,7 @@ value for pluggabilityScan and tldScan attributes of the standard JarScanFilter implementation. - The coded default empty, however the system property is set in + The coded default is empty, however the system property is set in a default Tomcat installation via the $CATALINA_BASE/conf/catalina.properties file. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
buildbot success in ASF Buildbot on tomcat-trunk
The Buildbot has detected a restored build on builder tomcat-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-trunk/builds/403 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: silvanus_ubuntu Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-commit' triggered this build Build Source Stamp: [branch tomcat/trunk] 1707617 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
svn commit: r1707617 - in /tomcat/trunk/java/org/apache/coyote/http2: Stream.java StreamProcessor.java
Author: markt
Date: Thu Oct 8 20:40:25 2015
New Revision: 1707617
URL: http://svn.apache.org/viewvc?rev=1707617&view=rev
Log:
Get FORM authentication working
Modified:
tomcat/trunk/java/org/apache/coyote/http2/Stream.java
tomcat/trunk/java/org/apache/coyote/http2/StreamProcessor.java
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=1707617&r1=1707616&r2=1707617&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http2/Stream.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http2/Stream.java Thu Oct 8 20:40:25
2015
@@ -609,6 +609,11 @@ public class Stream extends AbstractStre
}
+protected synchronized void insertReplayedBody(ByteChunk body) {
+inBuffer = ByteBuffer.wrap(body.getBytes(), body.getOffset(),
body.getLength());
+}
+
+
private void ensureBuffersExist() {
if (inBuffer == null) {
synchronized (this) {
Modified: tomcat/trunk/java/org/apache/coyote/http2/StreamProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http2/StreamProcessor.java?rev=1707617&r1=1707616&r2=1707617&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http2/StreamProcessor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http2/StreamProcessor.java Thu Oct 8
20:40:25 2015
@@ -33,6 +33,7 @@ import org.apache.coyote.ContainerThread
import org.apache.coyote.ErrorState;
import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
+import org.apache.tomcat.util.buf.ByteChunk;
import org.apache.tomcat.util.net.AbstractEndpoint.Handler.SocketState;
import org.apache.tomcat.util.net.DispatchType;
import org.apache.tomcat.util.net.SSLSupport;
@@ -181,6 +182,12 @@ public class StreamProcessor extends Abs
request.setAvailable(stream.getInputBuffer().available());
break;
}
+case REQ_SET_BODY_REPLAY: {
+ByteChunk body = (ByteChunk) param;
+stream.getInputBuffer().insertReplayedBody(body);
+stream.receivedEndOfStream();
+break;
+}
case RESET: {
stream.getOutputBuffer().reset();
break;
@@ -382,11 +389,6 @@ public class StreamProcessor extends Abs
case UPGRADE:
throw new UnsupportedOperationException(
sm.getString("streamProcessor.httpupgrade.notsupported"));
-
-// Unimplemented / to review
-case REQ_SET_BODY_REPLAY:
-log.info("TODO: Implement [" + actionCode + "] for HTTP/2");
-break;
}
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
buildbot failure in ASF Buildbot on tomcat-trunk
The Buildbot has detected a new failure on builder tomcat-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-trunk/builds/402 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: silvanus_ubuntu Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-commit' triggered this build Build Source Stamp: [branch tomcat/trunk] 1707608 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
svn commit: r1707608 - in /tomcat/trunk/java/org/apache/coyote/http2: Stream.java StreamProcessor.java
Author: markt
Date: Thu Oct 8 19:14:31 2015
New Revision: 1707608
URL: http://svn.apache.org/viewvc?rev=1707608&view=rev
Log:
Implement some more Processor actions for HTTP/2.
Modified:
tomcat/trunk/java/org/apache/coyote/http2/Stream.java
tomcat/trunk/java/org/apache/coyote/http2/StreamProcessor.java
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=1707608&r1=1707607&r2=1707608&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http2/Stream.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http2/Stream.java Thu Oct 8 19:14:31
2015
@@ -442,6 +442,10 @@ public class Stream extends AbstractStre
return false;
}
+synchronized void reset() {
+buffer.clear();
+}
+
synchronized boolean isReady() {
if (getWindowSize() > 0 && handler.getWindowSize() > 0) {
return true;
Modified: tomcat/trunk/java/org/apache/coyote/http2/StreamProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http2/StreamProcessor.java?rev=1707608&r1=1707607&r2=1707608&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http2/StreamProcessor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http2/StreamProcessor.java Thu Oct 8
19:14:31 2015
@@ -177,12 +177,38 @@ public class StreamProcessor extends Abs
}
break;
}
+case AVAILABLE: {
+request.setAvailable(stream.getInputBuffer().available());
+break;
+}
+case RESET: {
+stream.getOutputBuffer().reset();
+break;
+}
+
+// Error handling
case IS_ERROR: {
((AtomicBoolean) param).set(getErrorState().isError());
break;
}
-case AVAILABLE: {
-request.setAvailable(stream.getInputBuffer().available());
+case CLOSE_NOW: {
+// No need to block further output. This is called by the error
+// reporting valve if the response is already committed. It will
+// flush any remaining response data before this call.
+// Setting the error state will then cause this stream to be reset.
+setErrorState(ErrorState.CLOSE_NOW, null);
+break;
+}
+case DISABLE_SWALLOW_INPUT: {
+// NO-OP
+// HTTP/2 has to swallow any input received to ensure that the flow
+// control windows are correctly tracked.
+break;
+}
+case END_REQUEST: {
+// NO-OP
+// This action is geared towards handling HTTP/1.1 expectations and
+// keep-alive. Does not apply to HTTP/2 streams.
break;
}
@@ -358,11 +384,7 @@ public class StreamProcessor extends Abs
sm.getString("streamProcessor.httpupgrade.notsupported"));
// Unimplemented / to review
-case CLOSE_NOW:
-case DISABLE_SWALLOW_INPUT:
-case END_REQUEST:
case REQ_SET_BODY_REPLAY:
-case RESET:
log.info("TODO: Implement [" + actionCode + "] for HTTP/2");
break;
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [VOTE] Release Apache Tomcat 8.0.28
2015-10-07 21:13 GMT+02:00 Mark Thomas : > The proposed 8.0.28 release is: > [ ] Broken - do not release > [X] Stable - go ahead and release as 8.0.28 > > Ok, let's try that monthly release schedule then. Rémy
[Bug 58489] QueryStatsComparator throws IllegalArgumentException: Comparison method violates its general contract!
https://bz.apache.org/bugzilla/show_bug.cgi?id=58489 Jan Havel changed: What|Removed |Added CC||have...@gmail.com -- 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 58489] New: QueryStatsComparator throws IllegalArgumentException: Comparison method violates its general contract!
https://bz.apache.org/bugzilla/show_bug.cgi?id=58489 Bug ID: 58489 Summary: QueryStatsComparator throws IllegalArgumentException: Comparison method violates its general contract! Product: Tomcat Modules Version: unspecified Hardware: All OS: All Status: NEW Severity: major Priority: P2 Component: jdbc-pool Assignee: dev@tomcat.apache.org Reporter: have...@gmail.com Created attachment 33177 --> https://bz.apache.org/bugzilla/attachment.cgi?id=33177&action=edit JUnit test to show the exception Overview: QueryStatsComparator may throw java.lang.IllegalArgumentException: Comparison method violates its general contract! This happens in specific situations depending on the data in the reported queries. In our environment this occurs every time we keep the server running until the maxCapacity (1000 items) is reached and the removeOldest method is called. I have managed to narrow down the test data from more than 1000 records to around 40 items and created a JUnit test to showcase the error. I needed to copy some parts out of the SlowQueryReport class and made some simplifications as the QueryStatsComparator is not reachable from outside. Steps to Reproduce: Please use the attached JUnit source code to reproduce this error. Additional Builds and Platforms: This bug seems to happen on all platforms. We are using Tomcat 8, tomcat-dbcp 8.0.24, JDK 1.80.0_60. Additional Information: It seems to be a problem of the first two lines of the QueryStatsComparator. Note that a single change in the data of the unit test may cause the Exception not to occur. Stacktrace: java.lang.IllegalArgumentException: Comparison method violates its general contract! at java.util.TimSort.mergeLo(TimSort.java:773) at java.util.TimSort.mergeAt(TimSort.java:510) at java.util.TimSort.mergeCollapse(TimSort.java:435) at java.util.TimSort.sort(TimSort.java:241) at java.util.Arrays.sort(Arrays.java:1512) at java.util.ArrayList.sort(ArrayList.java:1454) at java.util.Collections.sort(Collections.java:175) at org.apache.tomcat.jdbc.pool.interceptor.SlowQueryReport.removeOldest(SlowQueryReport.java:218) at org.apache.tomcat.jdbc.pool.interceptor.SlowQueryReport.getQueryStats(SlowQueryReport.java:205) at org.apache.tomcat.jdbc.pool.interceptor.SlowQueryReport.reportQuery(SlowQueryReport.java:119) at org.apache.tomcat.jdbc.pool.interceptor.AbstractQueryReport$StatementProxy.invoke(AbstractQueryReport.java:254) -- 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: [VOTE] Release Apache Tomcat 8.0.28
On 07/10/2015 20:13, Mark Thomas wrote: > The proposed Apache Tomcat 8.0.28 release is now available for voting. > > The main changes since 8.0.27 are: > > - Allow file based configuration resources (e.g. key stores) to be > configured using URLs > > - Restore code signing to the Windows installer an uninstaller > > There is a smaller that usual collection of bug fixes, new features and > performance improvements. For full details, see the changelog: > http://svn.us.apache.org/repos/asf/tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml > > It can be obtained from: > https://dist.apache.org/repos/dist/dev/tomcat/tomcat-8/v8.0.28/ > The Maven staging repo is: > https://repository.apache.org/content/repositories/orgapachetomcat-1052/ > The svn tag is: > http://svn.apache.org/repos/asf/tomcat/tc8.0.x/tags/TOMCAT_8_0_28/ > > The proposed 8.0.28 release is: > [ ] Broken - do not release > [X] Stable - go ahead and release as 8.0.28 Unit tests passing for BIO, NIO, NIO2 and APr/native on OSX, Linux and Windows. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Time for 7.0.65
Hi, I'm planning to start preparation for 7.0.65. If you need to add something please reply here. Regards, Violeta
buildbot success in ASF Buildbot on tomcat-trunk
The Buildbot has detected a restored build on builder tomcat-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-trunk/builds/401 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: silvanus_ubuntu Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-commit' triggered this build Build Source Stamp: [branch tomcat/trunk] 1707466 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
svn commit: r1707466 - /tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Section_5_3.java
Author: markt
Date: Thu Oct 8 09:50:24 2015
New Revision: 1707466
URL: http://svn.apache.org/viewvc?rev=1707466&view=rev
Log:
More changes to make the test robust to differences in timing of stream
processing
Modified:
tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Section_5_3.java
Modified: tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Section_5_3.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Section_5_3.java?rev=1707466&r1=1707465&r2=1707466&view=diff
==
--- tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Section_5_3.java
(original)
+++ tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Section_5_3.java Thu Oct
8 09:50:24 2015
@@ -117,9 +117,17 @@ public class TestHttp2Section_5_3 extend
// At this point 17 is blocked because the stream window is zero and
// 19 & 21 are blocked because the connection window is zero.
//
-// Note: All these streams are processed in their own threads so it is
-// possible that not all of them reach the point where output
-// is blocked at the same time.
+// To test allocation, the connection window size is increased by 1.
+// This should result in an allocation of 1 byte each to streams 19 and
+// 21 but because each stream is processed in a separate thread it is
+// not guaranteed that both streams will be blocked when the connection
+// window size is increased. The test therefore sends 1 byte window
+// updates until a small body has been seen from each stream. Then the
+// tests sends a larger (1024 byte) window update and checks that it is
+// correctly distributed between the streams.
+//
+// The test includes a margin to allow for the potential differences in
+// response caused by timing differences on the server.
//
// The loop below handles 0, 1 or 2 stream being blocked
// - If 0 streams are blocked the connection window will be set to one
@@ -146,13 +154,18 @@ public class TestHttp2Section_5_3 extend
parser.readFrame(true);
// Debugging Gump failure
log.info(output.getTrace());
-if (output.getTrace().contains("19-Body-1")) {
+int[] data = parseBodyFrame(output.getTrace());
+if (data[0] == 19) {
seen19 = true;
-} else if (output.getTrace().contains("21-Body-1")) {
+} else if (data[0] == 21) {
seen21 = true;
} else {
-// Unexpected trace
-Assert.fail(output.getTrace());
+// Unexpected stream
+Assert.fail("Unexpected stream: [" + output.getTrace() + "]");
+}
+if (data[1] > 3) {
+// Larger than expected body size
+Assert.fail("Larger than expected body: [" + output.getTrace()
+ "]");
}
output.clearTrace();
}
@@ -160,29 +173,44 @@ public class TestHttp2Section_5_3 extend
sendWindowUpdate(0, 1024);
parser.readFrame(true);
-// Make sure you have read the big comment before the loop above.
-// The 2 streams blocked case assumes that the server processes the
-// window update fast enough that both streams will have written their
-// byte and updated the connection window size to -1 before the next
-// window update frame is processed. That doesn't always happen. If it
-// doesn't another 1 byte data frame will be sent for each stream.
Those
-// need to be swallowed here.
-while (output.getTrace().contains("Body-1")) {
+// Make sure you have read the big comment before the loop above. It is
+// possible that the timing of the server threads is such that there
are
+// still small body frames to read.
+int[] data = parseBodyFrame(output.getTrace());
+while (data[1] < 4) {
// Debugging Gump failure
log.info(output.getTrace());
output.clearTrace();
parser.readFrame(true);
+data = parseBodyFrame(output.getTrace());
}
+// Should now have two larger body frames. One has already been read.
+seen19 = false;
+seen21 = false;
+while (!seen19 && !seen21) {
+// Debugging Gump failure
+log.info(output.getTrace());
+if (data[0] == 19) {
+seen19 = true;
+if (data[1] < 256 || data[1] > 260) {
+Assert.fail("Unexpected body size: [" + output.getTrace()
+ "]");
+}
+} else if (data[0] == 21) {
+seen21 = true;
+if (data[1] < 768 || data[1] > 772) {
+Assert.fail("Unexpected body size: ["
Re: buildbot failure in ASF Buildbot on tomcat-trunk
On 07/10/2015 22:54, build...@apache.org wrote: > The Buildbot has detected a new failure on builder tomcat-trunk while > building ASF Buildbot. Full details are available at: > http://ci.apache.org/builders/tomcat-trunk/builds/400 > > Buildbot URL: http://ci.apache.org/ > > Buildslave for this Build: silvanus_ubuntu > > Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-commit' > triggered this build > Build Source Stamp: [branch tomcat/trunk] 1707398 > Blamelist: markt > > BUILD FAILED: failed compile_1 The timing fairies *really* don't seem to like me this week. This is 5_3 which has found yet another way to behave I didn't expect. I'm taking yet another look at this now. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[GUMP@vmgump]: Project tomcat-trunk-test-apr (in module tomcat-trunk) 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-trunk-test-apr has an issue affecting its community integration. This issue affects 1 projects, and has been outstanding for 5 runs. The current state of this project is 'Failed', with reason 'Build Timed Out'. For reference only, the following projects are affected by this: - tomcat-trunk-test-apr : Tomcat 9.x, a web server implementing the Java Servlet 4.0, ... Full details are available at: http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-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 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. -INFO- Failed with reason build timed out -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-trunk/output/logs-APR -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-trunk/output/test-tmp-APR/logs -WARNING- No directory [/srv/gump/public/workspace/tomcat-trunk/output/test-tmp-APR/logs] The following work was performed: http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-test-apr/gump_work/build_tomcat-trunk_tomcat-trunk-test-apr.html Work Name: build_tomcat-trunk_tomcat-trunk-test-apr (Type: Build) Work ended in a state of : Failed Elapsed: 1 hour 1 sec 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 -Djunit.jar=/srv/gump/public/workspace/junit/target/junit-4.13-SNAPSHOT.jar -Dobjenesis.jar=/srv/gump/public/workspace/objenesis/main/target/objenesis-2.3-SNAPSHOT.jar -Dtest.reports=output/logs-APR -Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20151008-native-src.tar.gz -Dexamples.sources.skip=true -Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.5-201506032000/ecj-4.5.jar -Dtest.apr.loc=/srv/gump/public/workspace/tomcat-native-trunk/dest-20151008/lib -Dtest.relaxTiming=true -Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20151008.jar -Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20151008-native-src.tar.gz -Dtest.temp=output/test-tmp-APR -Dtest.accesslog=true - Dexecute.test.nio=false -Dtest.openssl.path=/srv/gump/public/workspace/openssl-master/dest-20151008/bin/openssl -Dexecute.test.apr=true -Dtest.excludePerformance=true -Dexecute.test.nio2=false -Deasymock.jar=/srv/gump/public/workspace/easymock/core/target/easymock-3.5-SNAPSHOT.jar -Dhamcrest.jar=/srv/gump/packages/hamcrest/hamcrest-core-1.3.jar -Dcglib.jar=/srv/gump/packages/cglib/cglib-nodep-2.2.jar test [Working Directory: /srv/gump/public/workspace/tomcat-trunk] CLASSPATH: /usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-trunk/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-trunk/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/servlet-api.ja r:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/websocket-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jaspic-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-storeconfig.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jasper.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jasper-el.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-tribes.jar:/srv/g
[Bug 58487] java.net.SocketException: Connection reset
https://bz.apache.org/bugzilla/show_bug.cgi?id=58487 Mark Thomas changed: What|Removed |Added Resolution|--- |INVALID Status|NEW |RESOLVED --- Comment #1 from Mark Thomas --- Bugzilla is not a support forum. -- 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
