svn commit: r1837786 - in /tomcat/trunk: java/org/apache/catalina/filters/CorsFilter.java webapps/docs/changelog.xml
Author: fschumacher
Date: Fri Aug 10 10:00:18 2018
New Revision: 1837786
URL: http://svn.apache.org/viewvc?rev=1837786&view=rev
Log:
Use short circuit logic to prevent potential NPE in CorsFilter.
The same logic is used a few lines below, so it was most probably
intended that way anyways.
Modified:
tomcat/trunk/java/org/apache/catalina/filters/CorsFilter.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/catalina/filters/CorsFilter.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/filters/CorsFilter.java?rev=1837786&r1=1837785&r2=1837786&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/filters/CorsFilter.java (original)
+++ tomcat/trunk/java/org/apache/catalina/filters/CorsFilter.java Fri Aug 10
10:00:18 2018
@@ -453,7 +453,7 @@ public class CorsFilter extends GenericF
String.valueOf(preflightMaxAge));
}
-if ((allowedHttpMethods != null & !allowedHttpMethods.isEmpty()))
{
+if ((allowedHttpMethods != null) &&
(!allowedHttpMethods.isEmpty())) {
response.addHeader(
CorsFilter.RESPONSE_HEADER_ACCESS_CONTROL_ALLOW_METHODS,
join(allowedHttpMethods, ","));
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1837786&r1=1837785&r2=1837786&view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Fri Aug 10 10:00:18 2018
@@ -103,6 +103,9 @@
62607: Return a non-zero exit code from
catalina.[bat|sh] run if Tomcat fails to start. (markt)
+
+Use short circuit logic to prevent potential NPE in CorsFilter.
(fschumacher)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1837787 - in /tomcat/trunk: java/org/apache/catalina/realm/JAASRealm.java webapps/docs/changelog.xml
Author: fschumacher
Date: Fri Aug 10 10:08:54 2018
New Revision: 1837787
URL: http://svn.apache.org/viewvc?rev=1837787&view=rev
Log:
Simplify construction of appName from container name in JAASRealm.
There is no need to add a slash in front of the container name as
the method makeLegalForJAAS will strip it off directly afterwards.
That removes the need for a temporary variable.
Modified:
tomcat/trunk/java/org/apache/catalina/realm/JAASRealm.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/catalina/realm/JAASRealm.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/realm/JAASRealm.java?rev=1837787&r1=1837786&r2=1837787&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/realm/JAASRealm.java (original)
+++ tomcat/trunk/java/org/apache/catalina/realm/JAASRealm.java Fri Aug 10
10:08:54 2018
@@ -227,13 +227,7 @@ public class JAASRealm extends RealmBase
super.setContainer(container);
if( appName==null ) {
-String name = container.getName();
-if (!name.startsWith("/")) {
-name = "/" + name;
-}
-name = makeLegalForJAAS(name);
-
-appName=name;
+appName = makeLegalForJAAS(container.getName());
log.info("Set JAAS app name " + appName);
}
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1837787&r1=1837786&r2=1837787&view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Fri Aug 10 10:08:54 2018
@@ -106,6 +106,9 @@
Use short circuit logic to prevent potential NPE in CorsFilter.
(fschumacher)
+
+Simplify construction of appName from container name in JAASRealm.
(fschumacher)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1837788 - /tomcat/trunk/java/org/apache/catalina/realm/JAASRealm.java
Author: fschumacher
Date: Fri Aug 10 10:10:18 2018
New Revision: 1837788
URL: http://svn.apache.org/viewvc?rev=1837788&view=rev
Log:
Spacepolice
Modified:
tomcat/trunk/java/org/apache/catalina/realm/JAASRealm.java
Modified: tomcat/trunk/java/org/apache/catalina/realm/JAASRealm.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/realm/JAASRealm.java?rev=1837788&r1=1837787&r2=1837788&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/realm/JAASRealm.java (original)
+++ tomcat/trunk/java/org/apache/catalina/realm/JAASRealm.java Fri Aug 10
10:10:18 2018
@@ -226,7 +226,7 @@ public class JAASRealm extends RealmBase
public void setContainer(Container container) {
super.setContainer(container);
-if( appName==null ) {
+if (appName == null) {
appName = makeLegalForJAAS(container.getName());
log.info("Set JAAS app name " + appName);
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 62603] Changes in tag files are not reflected in the rendered view or they end up with a java.lang.NoClassDefFoundError
https://bz.apache.org/bugzilla/show_bug.cgi?id=62603 --- Comment #6 from Jordi --- I've reviewed the changes and everything looks good(I will test/debug it also next week) Thanks -- 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
[GitHub] tomcat pull request #118: Fix typos detected by github.com/client9/misspell
GitHub user seratch opened a pull request: https://github.com/apache/tomcat/pull/118 Fix typos detected by github.com/client9/misspell Fixing typos is sometimes very hard. It's not so easy to visually review them. Recently, I discovered a very useful tool for it, [misspell](https://github.com/client9/misspell). This pull request fixes minor typos detected by [misspell](https://github.com/client9/misspell) except for the false positives. If you would like me to work on other files as well, let me know. ## before ``` $ misspell . | grep -v 'LocalStrings' java/javax/servlet/resources/XMLSchema.dtd:36:32: "overriden" is a misspelling of "overridden" java/javax/servlet/resources/XMLSchema.dtd:173:43: "overriden" is a misspelling of "overridden" java/javax/servlet/resources/j2ee_web_services_client_1_1.xsd:191:34: "refered" is a misspelling of "referred" java/javax/servlet/resources/javaee_web_services_client_1_2.xsd:263:34: "refered" is a misspelling of "referred" java/javax/servlet/resources/javaee_web_services_client_1_3.xsd:173:34: "refered" is a misspelling of "referred" java/javax/servlet/resources/javaee_web_services_client_1_4.xsd:169:34: "refered" is a misspelling of "referred" java/javax/servlet/resources/web-app_3_0.xsd:129:61: "occurence" is a misspelling of "occurrence" java/javax/servlet/resources/web-app_4_0.xsd:125:61: "occurence" is a misspelling of "occurrence" java/javax/servlet/resources/web-app_3_1.xsd:129:61: "occurence" is a misspelling of "occurrence" java/javax/servlet/resources/web-fragment_3_0.xsd:129:61: "occurence" is a misspelling of "occurrence" java/javax/servlet/resources/web-fragment_3_1.xsd:129:61: "occurence" is a misspelling of "occurrence" java/javax/servlet/resources/web-jsptaglibrary_1_1.dtd:38:58: "prefered" is a misspelling of "preferred" java/javax/servlet/resources/web-fragment_4_0.xsd:125:61: "occurence" is a misspelling of "occurrence" java/javax/servlet/resources/web-jsptaglibrary_1_2.dtd:53:62: "prefered" is a misspelling of "preferred" java/javax/servlet/resources/web-jsptaglibrary_2_0.xsd:685:50: "prefered" is a misspelling of "preferred" java/org/apache/catalina/connector/CoyoteInputStream.java:141:25: "transfered" is a misspelling of "transferred" java/org/apache/catalina/connector/InputBuffer.java:354:25: "transfered" is a misspelling of "transferred" java/org/apache/catalina/filters/ExpiresFilter.java:1173:7: "occurence" is a misspelling of "occurrence" java/org/apache/catalina/ha/session/SessionMessageImpl.java:74:54: "transfered" is a misspelling of "transferred" java/org/apache/catalina/ha/session/SessionMessageImpl.java:147:74: "TRANSFERED" is a misspelling of "TRANSFERRED" java/org/apache/catalina/ha/session/DeltaManager.java:299:22: "transfered" is a misspelling of "transferred" java/org/apache/catalina/ha/session/DeltaManager.java:805:42: "transfered" is a misspelling of "transferred" java/org/apache/catalina/ha/session/DeltaManager.java:806:59: "transfered" is a misspelling of "transferred" java/org/apache/catalina/ha/session/DeltaManager.java:814:34: "transfered" is a misspelling of "transferred" java/org/apache/catalina/ha/session/DeltaManager.java:826:38: "transfered" is a misspelling of "transferred" java/org/apache/catalina/ha/session/DeltaManager.java:1200:48: "transfered" is a misspelling of "transferred" java/org/apache/catalina/ha/session/DeltaManager.java:1334:44: "transfered" is a misspelling of "transferred" java/org/apache/catalina/ha/session/DeltaManager.java:1372:86: "TRANSFERED" is a misspelling of "TRANSFERRED" java/org/apache/catalina/ha/session/DeltaManager.java:1373:31: "TRANSFERED" is a misspelling of "TRANSFERRED" java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java:799:32: "transfered" is a misspelling of "transferred" java/org/apache/catalina/ha/session/mbeans-descriptors.xml:262:36: "transfered" is a misspelling of "transferred" java/org/apache/catalina/servlets/CGIServlet.java:1164:67: "existant" is a misspelling of "existent" java/org/apache/catalina/servlets/CGIServlet.java:1428:59: "recommedations" is a misspelling of "recommendations" java/org/apache/catalina/storeconfig/StandardContextSF.java:164:47: "orginal" is a misspelling of "original" java/org/apache/catalina/storeconfig/StoreAppender.java:295:18: "orginal" is a misspelling of "original" java/org/apache/catalina/tribes/transport/bio/BioSender.java:104:39: "occured" is a misspelling of "occurred" java/org/apache/catalina/users/mbeans-descriptors.xml:46:26: "persistant" is a misspelling of "persistent" java/org/apache/catalina/valves/StuckThreadDetectionValve.java:356:22: "agains" is a misspelling of "against" java/org/apache/coyote/Response.java:101:21: "commited" is a misspelling of "committed" java/org/apache/coyote
[Bug 62614] Async servlet over HTTP/2 WriteListener does not work because outputstream.write is hanging even it's ready
https://bz.apache.org/bugzilla/show_bug.cgi?id=62614
Mark Thomas changed:
What|Removed |Added
Status|NEW |RESOLVED
Resolution|--- |INVALID
--- Comment #1 from Mark Thomas ---
There is no Tomcat bug here.
The test case makes the (invalid) assumption that the network buffers will fill
up and isReady() will return false. They don't.
Essentially the code enters an infinite loop here:
while(output.isReady()) {
output.write(bytes);
}
There are multiple ways you van observe this:
- enable debug logging for the HTTP/2 (conf/logging.propeties)
- watch network traffic with Wireshark or similar
- debug 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 62615] WsSession leaks if java.net.SocketTimeoutException occurs after session.close()
https://bz.apache.org/bugzilla/show_bug.cgi?id=62615 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |INVALID OS||All --- Comment #1 from Mark Thomas --- The provided test case is significantly more than the minimum necessary to reproduce the issue. "mvn package" fails. Re-creating the test as a Tomcat unit test does not demonstrate a memory leak. No evidence (i.e. a reference chain) has been provided to demonstrate that a memory leak exists. This is the second report claiming a memory leak where: - a huge test case has been provided - 'mvn package' fails - no evidence of a memory leak can be found A significant amount of time has been spend investigating these reports that could have been better spent elsewhere. Based on this experience, future reports along these lines are likely to be resolved as invalid without investigation unless the quality of the reports improves. As a minimum, future reports should be provided as a WAR (with full source) for the server and a stand-alone Java application (in source form) for the client. Better still, would be in the form of a patch to the Tomcat unit tests. -- 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
[GitHub] tomcat issue #118: Fix typos detected by github.com/client9/misspell
Github user markt-asf commented on the issue: https://github.com/apache/tomcat/pull/118 Thanks for this. Working through a review of the patch now. Note that there are some files that we can't change such as the Oracle provided XSDs. --- - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[GitHub] tomcat pull request #118: Fix typos detected by github.com/client9/misspell
Github user seratch commented on a diff in the pull request: https://github.com/apache/tomcat/pull/118#discussion_r209289041 --- Diff: java/org/apache/tomcat/dbcp/dbcp2/managed/ManagedConnection.java --- @@ -1,4 +1,4 @@ -/** +vi /** --- End diff -- I will remove this after your review... --- - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[GitHub] tomcat pull request #118: Fix typos detected by github.com/client9/misspell
Github user seratch commented on a diff in the pull request: https://github.com/apache/tomcat/pull/118#discussion_r209289321 --- Diff: java/org/apache/catalina/ha/session/SessionMessageImpl.java --- @@ -144,7 +144,7 @@ public String getEventTypeString() case EVT_GET_ALL_SESSIONS : return "SESSION-GET-ALL"; case EVT_SESSION_DELTA : return "SESSION-DELTA"; case EVT_ALL_SESSION_DATA : return "ALL-SESSION-DATA"; -case EVT_ALL_SESSION_TRANSFERCOMPLETE : return "SESSION-STATE-TRANSFERED"; +case EVT_ALL_SESSION_TRANSFERCOMPLETE : return "SESSION-STATE-TRANSFERRED"; --- End diff -- If I should keep the typo for now, I will revert this change. --- - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[GitHub] tomcat pull request #118: Fix typos detected by github.com/client9/misspell
Github user markt-asf commented on a diff in the pull request: https://github.com/apache/tomcat/pull/118#discussion_r209290720 --- Diff: java/org/apache/tomcat/dbcp/dbcp2/managed/ManagedConnection.java --- @@ -1,4 +1,4 @@ -/** +vi /** --- End diff -- No worries. The git repo is only a mirror so I have to manually apply to the patch to svn anyway. I'd already found this one and fixed it. --- - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[GitHub] tomcat pull request #118: Fix typos detected by github.com/client9/misspell
Github user markt-asf commented on a diff in the pull request: https://github.com/apache/tomcat/pull/118#discussion_r209292288 --- Diff: java/org/apache/catalina/ha/session/SessionMessageImpl.java --- @@ -144,7 +144,7 @@ public String getEventTypeString() case EVT_GET_ALL_SESSIONS : return "SESSION-GET-ALL"; case EVT_SESSION_DELTA : return "SESSION-DELTA"; case EVT_ALL_SESSION_DATA : return "ALL-SESSION-DATA"; -case EVT_ALL_SESSION_TRANSFERCOMPLETE : return "SESSION-STATE-TRANSFERED"; +case EVT_ALL_SESSION_TRANSFERCOMPLETE : return "SESSION-STATE-TRANSFERRED"; --- End diff -- This one is fine. It is only used for logging. And the similar issue in DeltaManager should be OK too. --- - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[GitHub] tomcat pull request #118: Fix typos detected by github.com/client9/misspell
Github user asfgit closed the pull request at: https://github.com/apache/tomcat/pull/118 --- - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1837809 - in /tomcat/trunk: java/javax/servlet/resources/ java/org/apache/catalina/connector/ java/org/apache/catalina/filters/ java/org/apache/catalina/ha/session/ java/org/apache/catali
Author: markt Date: Fri Aug 10 15:16:11 2018 New Revision: 1837809 URL: http://svn.apache.org/viewvc?rev=1837809&view=rev Log: Correct various spelling errors throughout the source code and documentation. Patch provided by Kazuhiro Sera. This closes #118 Modified: tomcat/trunk/java/javax/servlet/resources/XMLSchema.dtd tomcat/trunk/java/javax/servlet/resources/j2ee_web_services_client_1_1.xsd tomcat/trunk/java/javax/servlet/resources/web-jsptaglibrary_1_1.dtd tomcat/trunk/java/javax/servlet/resources/web-jsptaglibrary_1_2.dtd tomcat/trunk/java/javax/servlet/resources/web-jsptaglibrary_2_0.xsd tomcat/trunk/java/org/apache/catalina/connector/CoyoteInputStream.java tomcat/trunk/java/org/apache/catalina/connector/InputBuffer.java tomcat/trunk/java/org/apache/catalina/filters/ExpiresFilter.java tomcat/trunk/java/org/apache/catalina/ha/session/DeltaManager.java tomcat/trunk/java/org/apache/catalina/ha/session/SessionMessageImpl.java tomcat/trunk/java/org/apache/catalina/ha/session/mbeans-descriptors.xml tomcat/trunk/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java tomcat/trunk/java/org/apache/catalina/servlets/CGIServlet.java tomcat/trunk/java/org/apache/catalina/storeconfig/StandardContextSF.java tomcat/trunk/java/org/apache/catalina/storeconfig/StoreAppender.java tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/BioSender.java tomcat/trunk/java/org/apache/catalina/users/mbeans-descriptors.xml tomcat/trunk/java/org/apache/catalina/valves/StuckThreadDetectionValve.java tomcat/trunk/java/org/apache/coyote/Response.java tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/DriverManagerConnectionFactory.java tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/managed/ManagedConnection.java tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/managed/TransactionContext.java tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/managed/TransactionContextListener.java tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/managed/TransactionRegistry.java tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ClassParser.java tomcat/trunk/java/org/apache/tomcat/util/digester/RulesBase.java tomcat/trunk/java/org/apache/tomcat/util/digester/package.html tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/MultipartStream.java tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/ParameterParser.java tomcat/trunk/java/org/apache/tomcat/util/net/SecureNioChannel.java tomcat/trunk/res/findbugs/filter-false-positives.xml tomcat/trunk/res/rat/rat-excludes.txt tomcat/trunk/test/org/apache/catalina/tribes/demos/MapDemo.java tomcat/trunk/test/org/apache/tomcat/util/descriptor/web/TestWebXmlOrdering.java tomcat/trunk/webapps/docs/changelog.xml tomcat/trunk/webapps/docs/config/context.xml tomcat/trunk/webapps/docs/config/http.xml tomcat/trunk/webapps/docs/host-manager-howto.xml tomcat/trunk/webapps/docs/html-host-manager-howto.xml tomcat/trunk/webapps/docs/monitoring.xml Modified: tomcat/trunk/java/javax/servlet/resources/XMLSchema.dtd URL: http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/resources/XMLSchema.dtd?rev=1837809&r1=1837808&r2=1837809&view=diff == --- tomcat/trunk/java/javax/servlet/resources/XMLSchema.dtd (original) +++ tomcat/trunk/java/javax/servlet/resources/XMLSchema.dtd Fri Aug 10 15:16:11 2018 @@ -33,7 +33,7 @@ are defined in XML Schema: Part 2: Datatypes --> - - + @@ -2000,4 +2000,4 @@ - \ No newline at end of file + Modified: tomcat/trunk/res/rat/rat-excludes.txt URL: http://svn.apache.org/viewvc/tomcat/trunk/res/rat/rat-excludes.txt?rev=1837809&r1=1837808&r2=1837809&view=diff == --- tomcat/trunk/res/rat/rat-excludes.txt (original) +++ tomcat/trunk/res/rat/rat-excludes.txt Fri Aug 10 15:16:11 2018 @@ -51,7 +51,7 @@ (*.gif, *.jpg are also binary, but are automatically detected by RAT as ones, so no explicit configuration is needed) - - Markdown files for display in ther GitHub UI + - Markdown files for display in their GitHub UI - Temporary cache files used by Checkstle @@ -184,4 +184,4 @@ output/dist/temp/safeToDelete.tmp **/*.md -output/res/checkstyle/* \ No newline at end of file +output/res/checkstyle/* Modified: tomcat/trunk/test/org/apache/catalina/tribes/demos/MapDemo.java URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/tribes/demos/MapDemo.java?rev=1837809&r1=1837808&r2=1837809&view=diff == --- tomcat/trunk/test/org/apache/catalina/tribes/demos/MapDemo.java (original) +++ tomcat/trunk/test/org/apache/catalina/tribes/demos/MapDemo.java Fri Aug 10 15:16:11 2018 @@ -136,7 +136,7 @@ public class MapDemo im
svn commit: r1837810 - /tomcat/trunk/webapps/examples/WEB-INF/classes/jsp2/examples/simpletag/FindBookSimpleTag.java
Author: markt Date: Fri Aug 10 15:18:16 2018 New Revision: 1837810 URL: http://svn.apache.org/viewvc?rev=1837810&view=rev Log: Another typo reported by Kazuhiro Sera. Modified: tomcat/trunk/webapps/examples/WEB-INF/classes/jsp2/examples/simpletag/FindBookSimpleTag.java Modified: tomcat/trunk/webapps/examples/WEB-INF/classes/jsp2/examples/simpletag/FindBookSimpleTag.java URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/WEB-INF/classes/jsp2/examples/simpletag/FindBookSimpleTag.java?rev=1837810&r1=1837809&r2=1837810&view=diff == --- tomcat/trunk/webapps/examples/WEB-INF/classes/jsp2/examples/simpletag/FindBookSimpleTag.java (original) +++ tomcat/trunk/webapps/examples/WEB-INF/classes/jsp2/examples/simpletag/FindBookSimpleTag.java Fri Aug 10 15:18:16 2018 @@ -31,7 +31,7 @@ public class FindBookSimpleTag extends S private String var; private static final String BOOK_TITLE = "The Lord of the Rings"; -private static final String BOOK_AUTHOR = "J. R. R. Tolkein"; +private static final String BOOK_AUTHOR = "J. R. R. Tolkien"; private static final String BOOK_ISBN = "0618002251"; @Override - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[GitHub] tomcat issue #118: Fix typos detected by github.com/client9/misspell
Github user seratch commented on the issue: https://github.com/apache/tomcat/pull/118 Thank you for merging the changes. ð --- - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1837812 - in /tomcat/trunk/java/org/apache: coyote/http11/filters/SavedRequestInputFilter.java tomcat/util/buf/B2CConverter.java tomcat/util/buf/ByteChunk.java tomcat/util/buf/C2BConverte
Author: markt
Date: Fri Aug 10 15:26:16 2018
New Revision: 1837812
URL: http://svn.apache.org/viewvc?rev=1837812&view=rev
Log:
More typos reported by Kazuhiro Sera.
Modified:
tomcat/trunk/java/org/apache/coyote/http11/filters/SavedRequestInputFilter.java
tomcat/trunk/java/org/apache/tomcat/util/buf/B2CConverter.java
tomcat/trunk/java/org/apache/tomcat/util/buf/ByteChunk.java
tomcat/trunk/java/org/apache/tomcat/util/buf/C2BConverter.java
tomcat/trunk/java/org/apache/tomcat/util/buf/CharChunk.java
Modified:
tomcat/trunk/java/org/apache/coyote/http11/filters/SavedRequestInputFilter.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/filters/SavedRequestInputFilter.java?rev=1837812&r1=1837811&r2=1837812&view=diff
==
---
tomcat/trunk/java/org/apache/coyote/http11/filters/SavedRequestInputFilter.java
(original)
+++
tomcat/trunk/java/org/apache/coyote/http11/filters/SavedRequestInputFilter.java
Fri Aug 10 15:26:16 2018
@@ -52,7 +52,7 @@ public class SavedRequestInputFilter imp
ByteBuffer byteBuffer = handler.getByteBuffer();
byteBuffer.position(byteBuffer.limit()).limit(byteBuffer.capacity());
-input.substract(byteBuffer);
+input.subtract(byteBuffer);
return byteBuffer.remaining();
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/buf/B2CConverter.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/buf/B2CConverter.java?rev=1837812&r1=1837811&r2=1837812&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/buf/B2CConverter.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/buf/B2CConverter.java Fri Aug 10
15:26:16 2018
@@ -158,7 +158,7 @@ public class B2CConverter {
int pos = cb.position();
// Loop until one char is decoded or there is a decoder error
do {
-leftovers.put(bc.substractB());
+leftovers.put(bc.subtractB());
leftovers.flip();
result = decoder.decode(leftovers, cb, endOfInput);
leftovers.position(leftovers.limit());
@@ -188,7 +188,7 @@ public class B2CConverter {
if (bc.getLength() > 0) {
leftovers.limit(leftovers.array().length);
leftovers.position(bc.getLength());
-bc.substract(leftovers.array(), 0, bc.getLength());
+bc.subtract(leftovers.array(), 0, bc.getLength());
}
}
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/buf/ByteChunk.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/buf/ByteChunk.java?rev=1837812&r1=1837811&r2=1837812&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/buf/ByteChunk.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/buf/ByteChunk.java Fri Aug 10
15:26:16 2018
@@ -389,15 +389,32 @@ public final class ByteChunk extends Abs
// Removing data from the buffer
+/*
+ * @deprecated Use {@link #subtract()}.
+ * This method will be removed in Tomcat 10
+ */
+@Deprecated
public int substract() throws IOException {
+return subtract();
+}
+
+public int subtract() throws IOException {
if (checkEof()) {
return -1;
}
return buff[start++] & 0xFF;
}
-
+/*
+ * @deprecated Use {@link #subtractB()}.
+ * This method will be removed in Tomcat 10
+ */
+@Deprecated
public byte substractB() throws IOException {
+return subtractB();
+}
+
+public byte subtractB() throws IOException {
if (checkEof()) {
return -1;
}
@@ -405,7 +422,16 @@ public final class ByteChunk extends Abs
}
+/*
+ * @deprecated Use {@link #subtract(byte[],int,int)}.
+ * This method will be removed in Tomcat 10
+ */
+@Deprecated
public int substract(byte dest[], int off, int len) throws IOException {
+return subtract(dest, off, len);
+}
+
+public int subtract(byte dest[], int off, int len) throws IOException {
if (checkEof()) {
return -1;
}
@@ -429,8 +455,28 @@ public final class ByteChunk extends Abs
* @return an integer specifying the actual number of bytes read, or -1 if
* the end of the stream is reached
* @throws IOException if an input or output exception has occurred
+ *
+ * @deprecated Use {@link #subtract(ByteBuffer)}.
+ * This method will be removed in Tomcat 10
*/
+@Deprecated
public int substract(ByteBuffer to) throws IOException {
+return subtract(to);
+}
+
+
+
svn commit: r1837813 - /tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml
Author: markt Date: Fri Aug 10 15:29:21 2018 New Revision: 1837813 URL: http://svn.apache.org/viewvc?rev=1837813&view=rev Log: (empty) Modified: tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml Modified: tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml?rev=1837813&r1=1837812&r2=1837813&view=diff == --- tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml Fri Aug 10 15:29:21 2018 @@ -229,6 +229,10 @@ Update the internal fork of Apache Commons DBCP 2 to abc0484 (2018-08-09) to pick up some bug fixes and enhancements. (markt) + +Correct various spelling errors throughout the source code and +documentation. Patch provided by Kazuhiro Sera. (markt) + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1837814 - in /tomcat/tc8.5.x/trunk: ./ java/javax/servlet/resources/ java/org/apache/catalina/connector/ java/org/apache/catalina/filters/ java/org/apache/catalina/ha/session/ java/org/ap
Author: markt Date: Fri Aug 10 15:30:30 2018 New Revision: 1837814 URL: http://svn.apache.org/viewvc?rev=1837814&view=rev Log: Correct various spelling errors throughout the source code and documentation. Patch provided by Kazuhiro Sera. Modified: tomcat/tc8.5.x/trunk/ (props changed) tomcat/tc8.5.x/trunk/java/javax/servlet/resources/XMLSchema.dtd tomcat/tc8.5.x/trunk/java/javax/servlet/resources/j2ee_web_services_client_1_1.xsd tomcat/tc8.5.x/trunk/java/javax/servlet/resources/web-jsptaglibrary_1_1.dtd tomcat/tc8.5.x/trunk/java/javax/servlet/resources/web-jsptaglibrary_1_2.dtd tomcat/tc8.5.x/trunk/java/javax/servlet/resources/web-jsptaglibrary_2_0.xsd tomcat/tc8.5.x/trunk/java/org/apache/catalina/connector/CoyoteInputStream.java tomcat/tc8.5.x/trunk/java/org/apache/catalina/connector/InputBuffer.java tomcat/tc8.5.x/trunk/java/org/apache/catalina/filters/ExpiresFilter.java tomcat/tc8.5.x/trunk/java/org/apache/catalina/ha/session/DeltaManager.java tomcat/tc8.5.x/trunk/java/org/apache/catalina/ha/session/SessionMessageImpl.java tomcat/tc8.5.x/trunk/java/org/apache/catalina/ha/session/mbeans-descriptors.xml tomcat/tc8.5.x/trunk/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java tomcat/tc8.5.x/trunk/java/org/apache/catalina/servlets/CGIServlet.java tomcat/tc8.5.x/trunk/java/org/apache/catalina/storeconfig/StandardContextSF.java tomcat/tc8.5.x/trunk/java/org/apache/catalina/storeconfig/StoreAppender.java tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/transport/bio/BioSender.java tomcat/tc8.5.x/trunk/java/org/apache/catalina/users/mbeans-descriptors.xml tomcat/tc8.5.x/trunk/java/org/apache/catalina/valves/StuckThreadDetectionValve.java tomcat/tc8.5.x/trunk/java/org/apache/coyote/Response.java tomcat/tc8.5.x/trunk/java/org/apache/tomcat/dbcp/dbcp2/ (props changed) tomcat/tc8.5.x/trunk/java/org/apache/tomcat/dbcp/dbcp2/DriverManagerConnectionFactory.java tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/bcel/ (props changed) tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ClassParser.java tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/digester/RulesBase.java tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/digester/package.html tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/http/fileupload/ (props changed) tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/http/fileupload/MultipartStream.java tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/http/fileupload/ParameterParser.java tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/SecureNioChannel.java tomcat/tc8.5.x/trunk/res/rat/rat-excludes.txt tomcat/tc8.5.x/trunk/test/org/apache/catalina/tribes/demos/MapDemo.java tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/descriptor/web/TestWebXmlOrdering.java tomcat/tc8.5.x/trunk/webapps/docs/config/http.xml tomcat/tc8.5.x/trunk/webapps/docs/host-manager-howto.xml tomcat/tc8.5.x/trunk/webapps/docs/html-host-manager-howto.xml tomcat/tc8.5.x/trunk/webapps/docs/monitoring.xml tomcat/tc8.5.x/trunk/webapps/examples/WEB-INF/classes/jsp2/examples/simpletag/FindBookSimpleTag.java Propchange: tomcat/tc8.5.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Aug 10 15:30:30 2018 @@ -1,2 +1,2 @@ /tomcat/tc8.0.x/trunk:1809644 -/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,1739492,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,1744149,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,174508
svn commit: r1837815 - /tomcat/tc7.0.x/trunk/java/org/apache/catalina/ha/session/DeltaManager.java
Author: markt
Date: Fri Aug 10 15:40:03 2018
New Revision: 1837815
URL: http://svn.apache.org/viewvc?rev=1837815&view=rev
Log:
Typo
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/ha/session/DeltaManager.java
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/ha/session/DeltaManager.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/ha/session/DeltaManager.java?rev=1837815&r1=1837814&r2=1837815&view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/ha/session/DeltaManager.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/ha/session/DeltaManager.java
Fri Aug 10 15:40:03 2018
@@ -317,8 +317,8 @@ public class DeltaManager extends Cluste
}
/**
- * set that state ist complete transfered
- * @param stateTransfered
+ * Set that state transferred is complete
+ * @param stateTransfered Flag value
*/
public void setStateTransfered(boolean stateTransfered) {
this.stateTransfered = stateTransfered;
@@ -805,15 +805,15 @@ public class DeltaManager extends Cluste
}
/**
- * Wait that cluster session state is transfer or timeout after 60 Sec
- * With stateTransferTimeout == -1 wait that backup is transfered (forever
mode)
+ * Wait that cluster session state is transferred or timeout after 60 Sec
+ * With stateTransferTimeout == -1 wait that backup is transferred
(forever mode)
*/
protected void waitForSendAllSessions(long beforeSendTime) {
long reqStart = System.currentTimeMillis();
long reqNow = reqStart ;
boolean isTimeout = false;
if(getStateTransferTimeout() > 0) {
-// wait that state is transfered with timeout check
+// wait that state is transferred with timeout check
do {
try {
Thread.sleep(100);
@@ -825,7 +825,7 @@ public class DeltaManager extends Cluste
} while ((!getStateTransfered()) && (!isTimeout) &&
(!isNoContextManagerReceived()));
} else {
if(getStateTransferTimeout() == -1) {
-// wait that state is transfered
+// wait that state is transferred
do {
try {
Thread.sleep(100);
@@ -1191,7 +1191,7 @@ public class DeltaManager extends Cluste
/**
- * handle receive session state is complete transfered
+ * handle receive session state is complete transferred
* @param msg
* @param sender
*/
@@ -1306,7 +1306,7 @@ public class DeltaManager extends Cluste
* handle receive that other node want all sessions ( restart )
* a) send all sessions with one message
* b) send session at blocks
- * After sending send state is complete transfered
+ * After sending send state is complete transferred
* @param msg
* @param sender
* @throws IOException
@@ -1339,7 +1339,9 @@ public class DeltaManager extends Cluste
}//for
}//end if
-SessionMessage newmsg = new
SessionMessageImpl(name,SessionMessage.EVT_ALL_SESSION_TRANSFERCOMPLETE,
null,"SESSION-STATE-TRANSFERED", "SESSION-STATE-TRANSFERED"+ getName());
+SessionMessage newmsg = new SessionMessageImpl(name,
+SessionMessage.EVT_ALL_SESSION_TRANSFERCOMPLETE, null,
"SESSION-STATE-TRANSFERRED",
+"SESSION-STATE-TRANSFERRED" + getName());
newmsg.setTimestamp(findSessionTimestamp);
if (log.isDebugEnabled())
log.debug(sm.getString("deltaManager.createMessage.allSessionTransfered",getName()));
counterSend_EVT_ALL_SESSION_TRANSFERCOMPLETE++;
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1837816 [1/2] - in /tomcat/tc7.0.x/trunk: ./ java/javax/servlet/resources/ java/org/apache/catalina/filters/ java/org/apache/catalina/ha/session/ java/org/apache/catalina/ha/tcp/ java/org
Author: markt Date: Fri Aug 10 15:41:59 2018 New Revision: 1837816 URL: http://svn.apache.org/viewvc?rev=1837816&view=rev Log: Correct various spelling errors throughout the source code and documentation. Patch provided by Kazuhiro Sera. Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/java/javax/servlet/resources/XMLSchema.dtd tomcat/tc7.0.x/trunk/java/javax/servlet/resources/j2ee_web_services_client_1_1.xsd tomcat/tc7.0.x/trunk/java/org/apache/catalina/filters/ExpiresFilter.java tomcat/tc7.0.x/trunk/java/org/apache/catalina/ha/session/SessionMessageImpl.java tomcat/tc7.0.x/trunk/java/org/apache/catalina/ha/session/mbeans-descriptors.xml tomcat/tc7.0.x/trunk/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java tomcat/tc7.0.x/trunk/java/org/apache/catalina/servlets/CGIServlet.java tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/transport/bio/BioSender.java tomcat/tc7.0.x/trunk/java/org/apache/catalina/users/mbeans-descriptors.xml tomcat/tc7.0.x/trunk/java/org/apache/catalina/valves/StuckThreadDetectionValve.java tomcat/tc7.0.x/trunk/java/org/apache/coyote/Response.java tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/ (props changed) tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ClassParser.java tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/digester/RulesBase.java tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/digester/package.html tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/http/fileupload/ (props changed) tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/http/fileupload/MultipartStream.java tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/http/fileupload/ParameterParser.java tomcat/tc7.0.x/trunk/res/rat/rat-excludes.txt tomcat/tc7.0.x/trunk/test/org/apache/catalina/tribes/demos/MapDemo.java tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml tomcat/tc7.0.x/trunk/webapps/docs/config/http.xml tomcat/tc7.0.x/trunk/webapps/docs/host-manager-howto.xml tomcat/tc7.0.x/trunk/webapps/docs/html-host-manager-howto.xml tomcat/tc7.0.x/trunk/webapps/docs/monitoring.xml tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/jsp2/examples/simpletag/FindBookSimpleTag.java Propchange: tomcat/tc7.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Aug 10 15:41:59 2018 @@ -1,3 +1,3 @@ /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,1644525,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,1681703,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,1689921,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,1702 739,1702742,1702744,1702748,1702751,1702754,1702758,1702760,1702763,1702766,1708779,1708782,1708806,1709314,1709670,1710347,1710442,1710448,1710490,1710574,1710578,1712226,1712229,1712235,1712255,1712618,1712649,1712655,1712860,1712899,1712903,1712906,1712913,1712926,1712975,1713185,1713262,1713287,1713613,1713621,1713872,1713976,1713994,1713998,1714004,1714013,1714059,1714538,1714580,1715189,1715207,1715544,1715549,1715637,1715639-1715645,1715667,1715683,1715866,1715978,1715981,1716216-1716217,1716355,1716414,171642
svn commit: r1837816 [2/2] - in /tomcat/tc7.0.x/trunk: ./ java/javax/servlet/resources/ java/org/apache/catalina/filters/ java/org/apache/catalina/ha/session/ java/org/apache/catalina/ha/tcp/ java/org
Propchange: tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/http/fileupload/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Aug 10 15:41:59 2018 @@ -1,4 +1,4 @@ /commons/proper/fileupload/trunk/src/main/java/org/apache/commons/fileupload:605690-1458500,1458580,1458597,1458928,1458936,1459121,1459183-1459184,1459188,1459901,1460343,1475836,1507048,1513134-1565163,1596087-1682322,1725745-1754664 /tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/http/fileupload:1659191,1682325 -/tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/http/fileupload:1743722,1757203,1817283,1837755 -/tomcat/trunk/java/org/apache/tomcat/util/http/fileupload: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-1222328,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-124 0046,1240101,1240106,1240109,1240112,1240114,1240116,1240118,1240121,1240329,1240474-1240850,1240857,1241087,1241160,1241408-1241822,1241908-1241909,1241912-1242110,1242371-1292130,1292134-1292458,1292464-1292670,1292672-1292776,1292780-1293392,1293397-1297017,1297019-1297963,1297965-1299820,1300108,1300111-1300460,1300520-1300948,1300997,1301006,1301280,1302332,1302348,1302608-1302610,1302649,1302837,1303138,1303163,1303338,1303521,1303587,1303698,1303803,1303852,1304011,1304035,1304037,1304135,1304249,1304253,1304260,1304271,1304275,1304468,1304895,1304930-1304932,1305194,1305943,1305965,1306556,1306579-1306580,1307084,1307310,1307511-1307512,1307579,1307591,1307597,1310636,1310639-1310640,1310642,1310701,1311212,1311995,1327617,1327670,1331766,1333161,1333173,1333827,1334787,1335026,1335257,1335547,1335692,1335711,1335731,1336515,1336813,1336864,1336868,1336884,1337419,1337426,1337546,1337572,1337591-1337595,1337643,1337707,1337719,1337734,1337741,1337745,1338151-1338154,1338178, 1342027,1342029,1342315,1342320,1342476,1342498,1342503,1342717,1342795,1342805,1343044-1343046,1343335,1343394,1343400,1343629,1343708,1343718,1343895,1344063,1344068,1344250,1344266,1344515,1344528,1344612,1344629,1344725,1344868,1344890,1344893,1344896,1344901,1345020,1345029,1345039,1345287-1345290,1345294,1345309,1345325,1345357,1345367,1345579-1345580,1345582,1345688,1345699,1345704,1345731-1345732,1345737,1345744,1345752,1345754,1345779,1345781,1345846,1346107,1346376,1346404,1346510,1346514,1346519,1346581,1346635,1346644,1346683,1346794,1346885,1346932,1347034,1347047,1347087,1347108-1347109,1347583,1347737,1348105,1348357,1348398,1348425,1348461-1348495,1348498,1348752,1348762,1348772,1348776,1348859,1348968,1348973,1348989,1349007,1349237,1349298,1349317,1349410,1349473,1349539,1349879,1349887,1349893,1349922,1349984,1350124,1350241,1350243,1350294-1350295,1350299,1350864,1350900,1351010,1351054,1351056,1351068,1351134-1351135,1351148,1351259,1351604,1351636-1351640,13519 91,1351993,1352011,1352056,1352059,1352661,1352663,1352788,1352799,1353087,1353125,1353240,1353261,1353414,1353468,1353501,1353581,1353708,1354137,1354170,1354197,1354255,1354362,1354375,1354469,1354664,1354685,1354817,1354847,1354856,1355726,1355810,1356006-1356007,1356014,1356045,1356125,1356422,1356505,1356898,1357042,1357401,1357407,1358586,1358590,1358612-1358613,1359102,1359340,1359981,1360059,1360455,1360460,1360838,1360847,1360892,1360942,1361263,1361430,1361754-1361755,1361762,1361769,1361772,1361962,1361982,1361985,1361991,1364141,1364149,1364411-1364412,1364448,1366708,1366720,1366729,1366734,1366910,1366945,1366953,1366959,1367214,1370346,1370364,1370373,1370386,1370473,1370537,1370549,1370553,1370879,1370916,1370958,1370960,1370973,1371017,1371283,1371336,1371620,1371812,1371823,1371896,1371976,1371978,1371995,1371999,1372131,1372152,1372156,1372390,1373003,1373080,1373142,1373488,1373578,1373618,1373622,1373666,1373985,1373987,1373990,1373993,1374000,1374019,1374823,13 76994,1377078,1377292,1377311,1377342,1377433,1377444,1377516,1377518-1377519,1377532,1377535,1377544,1377689,1377785,1377794,1377811,1377824,1377827,1377831,1377852-1377853,1377887,1377900,1378322,1378361,1378394,1378699,1378715,1378818,1378868,1378918,1379047,1379090,1379178,1379206,1379213,1379418,1379580,1379590,1379639,137964
svn commit: r1837817 - /tomcat/trunk/java/org/apache/catalina/ha/session/DeltaManager.java
Author: markt
Date: Fri Aug 10 15:42:55 2018
New Revision: 1837817
URL: http://svn.apache.org/viewvc?rev=1837817&view=rev
Log:
Typo
Modified:
tomcat/trunk/java/org/apache/catalina/ha/session/DeltaManager.java
Modified: tomcat/trunk/java/org/apache/catalina/ha/session/DeltaManager.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/session/DeltaManager.java?rev=1837817&r1=1837816&r2=1837817&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/ha/session/DeltaManager.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/ha/session/DeltaManager.java Fri Aug
10 15:42:55 2018
@@ -297,7 +297,7 @@ public class DeltaManager extends Cluste
/**
* Set that state transferred is complete
- * @param stateTransfered Fag value
+ * @param stateTransfered Flag value
*/
public void setStateTransfered(boolean stateTransfered) {
this.stateTransfered = stateTransfered;
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 62614] Async servlet over HTTP/2 WriteListener does not work because outputstream.write is hanging even it's ready
https://bz.apache.org/bugzilla/show_bug.cgi?id=62614 --- Comment #2 from Dapeng Zhang --- My fault again, sorry about that. -- 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
[GitHub] tomcat pull request #114: Remove throws declaration of an exception which is...
Github user asfgit closed the pull request at: https://github.com/apache/tomcat/pull/114 --- - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1837818 - in /tomcat/trunk: java/org/apache/catalina/startup/Tomcat.java webapps/docs/changelog.xml
Author: markt
Date: Fri Aug 10 15:46:39 2018
New Revision: 1837818
URL: http://svn.apache.org/viewvc?rev=1837818&view=rev
Log:
Remove ServletException from declaration of Tomcat.addWebapp(String,String)
since it is never thrown.
Patch provided by Tzafrir.
This closes #114
Modified:
tomcat/trunk/java/org/apache/catalina/startup/Tomcat.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/catalina/startup/Tomcat.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/Tomcat.java?rev=1837818&r1=1837817&r2=1837818&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/startup/Tomcat.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/Tomcat.java Fri Aug 10
15:46:39 2018
@@ -218,9 +218,8 @@ public class Tomcat {
* @param docBase Base directory for the context, for static files.
* Must exist, relative to the server home
* @return the deployed context
- * @throws ServletException if a deployment error occurs
*/
-public Context addWebapp(String contextPath, String docBase) throws
ServletException {
+public Context addWebapp(String contextPath, String docBase) {
return addWebapp(getHost(), contextPath, docBase);
}
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1837818&r1=1837817&r2=1837818&view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Fri Aug 10 15:46:39 2018
@@ -109,6 +109,11 @@
Simplify construction of appName from container name in JAASRealm.
(fschumacher)
+
+Remove ServletException from declaration of
+Tomcat.addWebapp(String,String) since it is never thrown.
+Patch provided by Tzafrir. (markt)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1837819 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/catalina/startup/Tomcat.java webapps/docs/changelog.xml
Author: markt Date: Fri Aug 10 15:47:29 2018 New Revision: 1837819 URL: http://svn.apache.org/viewvc?rev=1837819&view=rev Log: Remove ServletException from declaration of Tomcat.addWebapp(String,String) since it is never thrown. Patch provided by Tzafrir. Modified: tomcat/tc8.5.x/trunk/ (props changed) tomcat/tc8.5.x/trunk/java/org/apache/catalina/startup/Tomcat.java tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc8.5.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Aug 10 15:47:29 2018 @@ -1,2 +1,2 @@ /tomcat/tc8.0.x/trunk:1809644 -/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,1739492,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,1744149,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745083,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,1745535,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,1747 404,1747506,1747536,1747924,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-1 756289,1756408-1756410,1756778,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-176205 3,1762123,1762168,1762172,1762182,1762201-1762202,1762204,1762208,1762288,1762296,1762324,1762348,1762353,1762362,1762374,1762492,1762503,1762505,1762541,1762608,1762710,1762753,1762766,1762769,1762944,1762947,1762953,1763167,1763179,1763232,1763259,1763271-1763272,1763276-1763277,1763319-1763320,1763370,1763372,1763375,1763377,
svn commit: r1837820 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/startup/Tomcat.java webapps/docs/changelog.xml
Author: markt Date: Fri Aug 10 15:49:08 2018 New Revision: 1837820 URL: http://svn.apache.org/viewvc?rev=1837820&view=rev Log: Remove ServletException from declaration of Tomcat.addWebapp(String,String) since it is never thrown. Patch provided by Tzafrir. Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/Tomcat.java tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc7.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Aug 10 15:49:08 2018 @@ -1,3 +1,3 @@ /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,1644525,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,1681703,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,1689921,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,1702 739,1702742,1702744,1702748,1702751,1702754,1702758,1702760,1702763,1702766,1708779,1708782,1708806,1709314,1709670,1710347,1710442,1710448,1710490,1710574,1710578,1712226,1712229,1712235,1712255,1712618,1712649,1712655,1712860,1712899,1712903,1712906,1712913,1712926,1712975,1713185,1713262,1713287,1713613,1713621,1713872,1713976,1713994,1713998,1714004,1714013,1714059,1714538,1714580,1715189,1715207,1715544,1715549,1715637,1715639-1715645,1715667,1715683,1715866,1715978,1715981,1716216-1716217,1716355,1716414,1716421,1717208-1717209,1717257,1717283,1717288,1717291,1717421,1717517,1717529,1718797,1718840-1718843,1719348,1719357-1719358,1719400,1719491,1719737,1720235,1720396,1720442,1720446,1720450,1720463,1720658-1720660,1720756,1720816,1721813,1721818,1721831,1721861,1721867,1721882,1722523,1722527,1722800,1722926,1722941,1722997,1723130,1723440,1723488,1723890,1724434,1724674,1724792,1724803,1724902,1725128,1725131,1725154,1725167,1725911,1725921,1725929,1725963-1725965,1725970,1 725974,1726171-1726173,1726175,1726179-1726182,1726190-1726191,1726195-1726200,1726203,1726226,1726576,1726630,1726992,1727029,1727037,1727671,1727676,1727900,1728028,1728092,1728439,1728449,1729186,1729362,1731009,1731303,1731867,1731872,1731874,1731876,1731885,1731947,1731955,1731959,1731977,1731984,1732360,1732490,1732672,1732902,1733166,1733603,1733619,1733735,1733752,1733764,1733915,1733941,1733964,1734115,1734133,1734261,1734421,1734531,1736286,1737967,1738173,1738182,1738992,1739039,1739089-1739091,1739294,1739777,1739821,1739981,1740513,1740726,1741019,1741162,1741217,1743647,1743681,1744152,1744272,1746732,1746750,1752739,1754615,1755886,1756018,1758563,1759565,1761686,1762173,1762206,1766280,1767507-1767508,1767653,1767656,1769267,1772949,1773521,1773527,1774104,1777015,1777213,1779330,1783151,1784188,1784966,1785670,1786846,1788260,1788999,1789140,1789402,1791529,1791559,1795291,1796906,1797523,1799214,1800998-1800999,1801003,1801007-1801008,1801017,1801020,1802808,180281 4,1803618,1806107,1806733,1807082-1807083,1808707,1808884,1809267,1809644,1809832,1809904,1809915,1809924,1810283,1810328,1810574,1810576-1810577,1810584,1810588,1811141,1811842,1812090,1812096,1812150,1812511,1814976,1814983,1815072,1815453,1815946,1815957,1816143,1816682,1817229,1817287,1820200,1820209,1820283,1820305,1821303-1821311,1821313,1821316,182133
[GitHub] tomcat pull request #117: Enhance the CATALINA_BASE documentation
Github user markt-asf commented on a diff in the pull request: https://github.com/apache/tomcat/pull/117#discussion_r209306777 --- Diff: webapps/docs/introduction.xml --- @@ -89,6 +80,122 @@ same as $CATALINA_HOME. + + Throughout the documentation, there are references to the two following +properties: + + +CATALINA_HOME: Represents the root of your Tomcat +installation, for example /home/tomcat/apache-tomcat-9.0.10 +or C:\Program Files\apache-tomcat-9.0.10. + + +CATALINA_BASE: Represents the root of a runtime +configuration of a specific Tomcat instance. If you want to have +multiple Tomcat instances on one machine, use the CATALINA_BASE +property. + + + + +If you set the properties to different locations, the CATALINA_HOME location +contains static sources, such as .jar files, or binary files. +The CATALINA_BASE location contains configuration files, log files, deployed +applications, and other runtime requirements. + + + + By default, CATALINA_HOME and CATALINA_BASE point to the same directory. + Set CATALINA_BASE manually when you require running multiple Tomcat + instances on one machine. Doing so provides the following benefits: + + + +Easier management of upgrading to a newer version of Tomcat. Because all +instances with single CATALINA_HOME location share one set of +.jar files and binary files, you can easily upgrade the files +to newer version and have the change propagated to all Tomcat instances +using the same CATALIA_HOME directory. + + +Avoiding duplication of the same static .jar files. + + +The possibility to share certain settings, for example the setenv shell +or bat script file (depending on your operating system). + + + + + + Before you start using CATALINA_BASE, create the directory you want to use + as CATALINA_BASE for the particular Tomcat instance. At minimum, it must + contain: + +conf/server.xml +conf/web.xml + + That includes the conf directory. Otherwise, Tomcat may + fail to start. + + + Additionally, it may also contain the following: + --- End diff -- I think some slightly stronger wording is required here. Not having some of these directories is going to cause problems. --- - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[GitHub] tomcat pull request #117: Enhance the CATALINA_BASE documentation
Github user markt-asf commented on a diff in the pull request: https://github.com/apache/tomcat/pull/117#discussion_r209308073 --- Diff: webapps/docs/introduction.xml --- @@ -89,6 +80,122 @@ same as $CATALINA_HOME. + + Throughout the documentation, there are references to the two following +properties: + + +CATALINA_HOME: Represents the root of your Tomcat +installation, for example /home/tomcat/apache-tomcat-9.0.10 +or C:\Program Files\apache-tomcat-9.0.10. + + +CATALINA_BASE: Represents the root of a runtime +configuration of a specific Tomcat instance. If you want to have +multiple Tomcat instances on one machine, use the CATALINA_BASE +property. + + + + +If you set the properties to different locations, the CATALINA_HOME location +contains static sources, such as .jar files, or binary files. +The CATALINA_BASE location contains configuration files, log files, deployed +applications, and other runtime requirements. + + + + By default, CATALINA_HOME and CATALINA_BASE point to the same directory. + Set CATALINA_BASE manually when you require running multiple Tomcat + instances on one machine. Doing so provides the following benefits: + + + +Easier management of upgrading to a newer version of Tomcat. Because all +instances with single CATALINA_HOME location share one set of +.jar files and binary files, you can easily upgrade the files +to newer version and have the change propagated to all Tomcat instances +using the same CATALIA_HOME directory. + + +Avoiding duplication of the same static .jar files. + + +The possibility to share certain settings, for example the setenv shell +or bat script file (depending on your operating system). + + + + + + Before you start using CATALINA_BASE, create the directory you want to use + as CATALINA_BASE for the particular Tomcat instance. At minimum, it must + contain: + +conf/server.xml +conf/web.xml + + That includes the conf directory. Otherwise, Tomcat may + fail to start. + + + Additionally, it may also contain the following: + + + The bin directory with the setenv.sh, + setenv.bat, and tomcat-juli.jar files. + + + The lib directory with further resources to be added on + classpath. + + + The logs directory for instance-specific log files. + + + The webapps directory for automatically loaded web + applications. + + + The work directory that contains temporary working + directories for the deployed web applications. + + + The temp directory used by the JVM for temporary files. + + + + + We recommend you not to change the tomcat-juli.jar file. + However, in case you require your own logging implementation, you can + replace the tomcat-juli.jar file in a CATALINA_BASE location + for the specific Tomcat instance. + + + We also recommend you not to copy over any configuration file that is identical + for multiple Tomcat instances, with the exception of the mandatory files. + For example, copy over the conf/logging.properties only if + you require the particular Tomcat instance to have specific logging settings. + --- End diff -- That won't work. Tomcat looks in CATALINA_BASE for the logging configuration. You could change that in catalina.[sh|bat] but that starts to make the setup more complicated. Generally, ALL configuration files are only read form BASE and DO NOT fall back to HOME. The only exception in bin/setenv.sh and this onyl falls back to HOME for historical backwards compatibility reasons. I'd suggest updating this to say copy all of conf/* across. --- - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 62614] Async servlet over HTTP/2 WriteListener does not work because outputstream.write is hanging even it's ready
https://bz.apache.org/bugzilla/show_bug.cgi?id=62614
Dapeng Zhang changed:
What|Removed |Added
Status|RESOLVED|REOPENED
Resolution|INVALID |---
--- Comment #3 from Dapeng Zhang ---
Update:
I couldn't produce the bug with the "curl --output -" command because the
output stream is always ready and enters an infinite loop, my bad; However, I
can produce it using nghttp (see
https://github.com/http2/http2-spec/wiki/Tools) client command, and this does
not make it enter infinite loop.
I added more debug info in the code to make sure we can see if it's looping or
not:
@Override
public void onWritePossible() throws IOException {
i++;
System.out.println("onWritePossible called " + i + " times");
if (i > 3) {
System.out.println("complete");
asyncContext.complete();
return;
}
int j = 0;
while(output.isReady()) {
System.out.println("start write j = " + j);
output.write(bytes);
System.out.println("write complete j = " + j);
j++;
}
System.out.println("output.isReady() = " + false);
}
Deploy it to Tomcat and call the nghttp client command
$ nghttp "http://127.0.0.1:8080/asyncwrite"; -v
It hangs. Check "logs/catalina.out", onWritePossible called only 1 time, and
never called back again and clearly it's not in an infinite loop this time.
onWritePossible called 1 times
start write j = 0
write complete j = 0
start write j = 1
write complete j = 1
output.isReady() = false
I also tried the same nghttp client to Jetty and Undertow, the onWritePossible
callback can be called 4 times and finish.
--
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-trunk
The Buildbot has detected a new failure on builder tomcat-trunk while building . Full details are available at: https://ci.apache.org/builders/tomcat-trunk/builds/3511 Buildbot URL: https://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] 1837812 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
[Bug 62614] Async servlet over HTTP/2 WriteListener does not work because onWritePossible is never called back again
https://bz.apache.org/bugzilla/show_bug.cgi?id=62614 Dapeng Zhang changed: What|Removed |Added Summary|Async servlet over HTTP/2 |Async servlet over HTTP/2 |WriteListener does not work |WriteListener does not work |because outputstream.write |because onWritePossible is |is hanging even it's ready |never called back again -- 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 62611] Compress log files after rotation
https://bz.apache.org/bugzilla/show_bug.cgi?id=62611 --- Comment #1 from Christopher Schultz --- Be careful; sometimes log files can be large and compressing them can take a while. I would recommend against adding more code to Tomcat that solves a problem already solved by better logging frameworks. Tomcat can be configured to use a logging framework for access-logs, so why not use e.g. log4j or the myriad other frameworks which already support rotation, compression, etc.? -- 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 success in on tomcat-trunk
The Buildbot has detected a restored build on builder tomcat-trunk while building . Full details are available at: https://ci.apache.org/builders/tomcat-trunk/builds/3512 Buildbot URL: https://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] 1837818 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
